me/guix
Archived
1
0
Fork 0
Code Activity

gnu: fprintd: Gexp arguments.

Browse source 
* gnu/packages/linux.scm (fprintd)[arguments]: Use Gexps.
This commit is contained in:
Tobias Geerinckx-Rice 2021-12-14 00:56:15 +01:00
parent 18bfe44ef6
commit 5ee8589c86
No known key found for this signature in database
GPG key ID: 0DB0FF884F556D79
1 changed files with 35 additions and 36 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

71
gnu/packages/freedesktop.scm
View file

@ -1695,45 +1695,44 @@ software.")
(base32 "015j8ikyv48qz8vn6kfvkwwg5ydzppl1lzf7vkali9ymywywfxsw")))) (base32 "015j8ikyv48qz8vn6kfvkwwg5ydzppl1lzf7vkali9ymywywfxsw"))))
(build-system meson-build-system) (build-system meson-build-system)
(arguments (arguments
`(#:configure-flags (list #:configure-flags
(list "-Dsystemd_system_unit_dir=/tmp" #~(list "-Dsystemd_system_unit_dir=/tmp"
(string-append "-Ddbus_service_dir=" (assoc-ref %outputs "out") (string-append "-Ddbus_service_dir=" #$output
"/share/dbus-1/system-services") "/share/dbus-1/system-services")
(string-append "-Dpam_modules_dir=" (assoc-ref %outputs "out") (string-append "-Dpam_modules_dir=" #$output
"/lib/security")) "/lib/security"))
#:phases #:phases
(modify-phases %standard-phases #~(modify-phases %standard-phases
(add-before 'configure 'patch-output-directories (add-before 'configure 'patch-output-directories
;; Install files to our output, not that of the ‘owner’ package. ;; Install files to our output, not that of the ‘owner’ package.
;; These are not exposed as Meson options and must be patched. ;; These are not exposed as Meson options and must be patched.
(lambda* (#:key outputs #:allow-other-keys) (lambda* (#:key outputs #:allow-other-keys)
(let ((out (assoc-ref outputs "out"))) (let ((out (assoc-ref outputs "out")))
(substitute* "meson.build" (substitute* "meson.build"
(("(dbus_interfaces_dir = ).*" _ set) (("(dbus_interfaces_dir = ).*" _ set)
(string-append set "'" out "/share/dbus-1/interfaces'\n")) (string-append set "'" out "/share/dbus-1/interfaces'\n"))
(("(polkit_policy_directory = ).*" _ set) (("(polkit_policy_directory = ).*" _ set)
(string-append set "'" out "/share/polkit-1/actions/'\n")) (string-append set "'" out "/share/polkit-1/actions/'\n"))
(("(dbus_data_dir = ).*" _ set) (("(dbus_data_dir = ).*" _ set)
(string-append set "get_option('prefix')" (string-append set "get_option('prefix')"
" / get_option('datadir')\n")))))) " / get_option('datadir')\n"))))))
(add-before 'configure 'patch-systemd-dependencies (add-before 'configure 'patch-systemd-dependencies
(lambda _ (lambda _
(substitute* "meson.build" (substitute* "meson.build"
(("(dependency\\(')(libsystemd|systemd)" _ prefix) (("(dependency\\(')(libsystemd|systemd)" _ prefix)
(string-append prefix "libelogind"))))) (string-append prefix "libelogind")))))
(add-before 'configure 'ignore-test-dependencies (add-before 'configure 'ignore-test-dependencies
(lambda _ (lambda _
(substitute* "meson.build" (substitute* "meson.build"
((".*gi\\.repository\\..*") "") ((".*gi\\.repository\\.FPrint.*") "")
(("pam_wrapper_dep .*") "") (("pam_wrapper_dep .*") "")
((".*'(cairo|dbus|dbusmock|gi|pypamtest)': .*,.*") "")) ((".*'(cairo|dbus|dbusmock|gi|pypamtest)': .*,.*") ""))
(substitute* "tests/pam/meson.build" (substitute* "tests/pam/meson.build"
((".*pam_wrapper.*") ""))))) ((".*pam_wrapper.*") "")))))
#:tests? #f)) ; XXX depend on unpackaged packages #:tests? #f)) ; XXX depend on unpackaged packages
(native-inputs (native-inputs
`(("gettext" ,gettext-minimal) `(("gettext" ,gettext-minimal)
("glib:bin" ,glib "bin") ; for glib-genmarshal ("glib:bin" ,glib "bin") ; for glib-genmarshal
("libxslt" ,libxslt) ; for xsltproc
("perl" ,perl) ; for pod2man ("perl" ,perl) ; for pod2man
("pkg-config" ,pkg-config))) ("pkg-config" ,pkg-config)))
;; For tests. ;; For tests.