Archived
1
0
Fork 0

gnu: upower: Fix indentation.

* gnu/packages/gnome.scm (upower): Fix indentation.
This commit is contained in:
Maxim Cournoyer 2022-08-29 19:26:30 -04:00
parent 164dfdc44e
commit 3f25fcf84d
No known key found for this signature in database
GPG key ID: 1260E46482E63562

View file

@ -5514,30 +5514,29 @@ faster results and to avoid unnecessary server load.")
(base32 "1g17rm91p8vfpjyb0k2shylrs55nccn3fa890vlk4n9s71sghbzq")) (base32 "1g17rm91p8vfpjyb0k2shylrs55nccn3fa890vlk4n9s71sghbzq"))
(modules '((guix build utils))) (modules '((guix build utils)))
(snippet (snippet
;; Upstream commit ;; Upstream commit <https://cgit.freedesktop.org/upower/commit/
;; <https://cgit.freedesktop.org/upower/commit/?id=18457c99b68786cd729b315723d680e6860d9cfa> ;; ?id=18457c99b68786cd729b315723d680e6860d9cfa> moved
;; moved 'dbus-1/system.d' from etc/ to share/. However, ;; 'dbus-1/system.d' from etc/ to share/. However,
;; 'dbus-configuration-directory' in (gnu services dbus) ;; 'dbus-configuration-directory' in (gnu services dbus) expects it in
;; expects it in etc/. Thus, move it back to its previous ;; etc/. Thus, move it back to its previous location.
;; location. #~(substitute* "src/meson.build"
#~(substitute* "src/meson.build"
(("dbusdir / 'system.d'") (("dbusdir / 'system.d'")
"get_option('sysconfdir') / 'dbus-1/system.d'") "get_option('sysconfdir') / 'dbus-1/system.d'")
;; Avoid writing to /var during the build, this is ;; Avoid writing to /var during the build, this is
;; not possible in Guix! ;; not possible in Guix!
(("^install_subdir\\('does-not-exist'.*$") ""))))) (("^install_subdir\\('does-not-exist'.*$") "")))))
(build-system meson-build-system) (build-system meson-build-system)
(arguments (arguments
(list (list
#:glib-or-gtk? #t #:glib-or-gtk? #t
#:configure-flags #:configure-flags
#~(list "-Dsystemdsystemunitdir=no" #~(list "-Dsystemdsystemunitdir=no"
;; If not specified, udev will try putting history information ;; If not specified, udev will try putting history information
;; in /gnu/store. ;; in /gnu/store.
"-Dhistorydir=/var/lib/upower" "-Dhistorydir=/var/lib/upower"
(string-append "-Dudevrulesdir=" #$output "/bin/udev/rules.d")))) (string-append "-Dudevrulesdir=" #$output "/bin/udev/rules.d"))))
(native-inputs (native-inputs
(list `(,glib "bin") ; for gdbus-codegen (list `(,glib "bin") ; for gdbus-codegen
gobject-introspection gobject-introspection
gtk-doc gtk-doc
intltool intltool
@ -5551,8 +5550,8 @@ faster results and to avoid unnecessary server load.")
umockdev umockdev
;; For man pages. ;; For man pages.
docbook-xsl docbook-xsl
libxslt ; for 'xsltproc' libxslt ; for 'xsltproc'
libxml2)) ; for 'XML_CATALOG_FILES' libxml2)) ; for 'XML_CATALOG_FILES'
(inputs (inputs
(list dbus-glib libgudev libusb)) (list dbus-glib libgudev libusb))
(propagated-inputs (propagated-inputs