TakeV/guix
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

gnu: upower: Fix indentation.

Browse source 
* 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
1 changed files with 18 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

37
gnu/packages/gnome.scm
View file

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