From 20e063e7d94c8c44bdd47722bb4306ed62fb9286 Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Tue, 30 Sep 2025 15:44:15 +0900 Subject: [PATCH] gnu: rpm: Restore localstatedir to /var. Commit 51e1f76 migrated the build system to CMake, and in the process, the localstatedir value became $prefix/var (inside the package prefix), which is not useful as this place should be writable for proper operation. * gnu/packages/package-management.scm (rpm) [#:phases] {install-macros-file}: New phase. Change-Id: I1d069243d3b1aff3b0cf0ae79ad5823f8c2a4aeb --- gnu/packages/package-management.scm | 15 ++++++++++++--- 1 file changed, 12 insertions(+), 3 deletions(-) diff --git a/gnu/packages/package-management.scm b/gnu/packages/package-management.scm index 9b0c4f1857d..abae481dab9 100644 --- a/gnu/packages/package-management.scm +++ b/gnu/packages/package-management.scm @@ -18,7 +18,7 @@ ;;; Copyright © 2020 Martin Becze ;;; Copyright © 2020 Vincent Legoll ;;; Copyright © 2021 Ivan Gankevich -;;; Copyright © 2021, 2022, 2023 Maxim Cournoyer +;;; Copyright © 2021, 2022, 2023, 2025 Maxim Cournoyer ;;; Copyright © 2021 John Kehayias ;;; Copyright © 2022, 2023 Zhu Zihao ;;; Copyright © 2023 jgart @@ -1043,7 +1043,7 @@ features of Stow with some extensions.") (build-system cmake-build-system) (arguments (list - #:tests? #f ; TEST need fhs envirnment. + #:tests? #f ;tests require FHS environment #:configure-flags #~(list ;; TODO: Add rpm-sequoia @@ -1073,7 +1073,16 @@ features of Stow with some extensions.") site))) (substitute* "plugins/CMakeLists.txt" (("\\$[{]dbus-1_DATADIR[}]") - (string-append #$output "/share")))))))) + (string-append #$output "/share"))))) + (add-after 'install 'install-macros-file + (lambda _ + (define macros (string-append #$output "/etc/rpm/macros")) + (mkdir-p (dirname macros)) + (call-with-output-file macros + (lambda (p) + (format p "\ +%_var /var +%_localstatedir /var~%")))))))) (native-inputs (list pkg-config python