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

gnu: upower: Install 'dbus-1/system.d/org.freedesktop.UPower.conf' to etc/.

Browse source 
Fixes <https://bugs.gnu.org/39203>.
Reported by Jesse Gibbons <jgibbons2357@gmail.com>.

* gnu/packages/gnome.scm (upower)[source]: Add 'modules' and 'snippet'.
This commit is contained in:
Ludovic Courtès 2020-01-21 13:56:06 +01:00
parent a19fb6a436
commit 5dc6d5ce99
No known key found for this signature in database
GPG key ID: 090B11993D9AEBB5
1 changed files with 15 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
gnu/packages/gnome.scm
View file

@ -1,6 +1,6 @@
;;; GNU Guix --- Functional package management for GNU
;;; Copyright © 2013, 2015 Andreas Enge <andreas@enge.fr>
;;; Copyright © 2014, 2015, 2016, 2017, 2018, 2019 Ludovic Courtès <ludo@gnu.org>
;;; Copyright © 2014, 2015, 2016, 2017, 2018, 2019, 2020 Ludovic Courtès <ludo@gnu.org>
;;; Copyright © 2014 Ian Denhardt <ian@zenhack.net>
;;; Copyright © 2014, 2016 Eric Bavier <bavier@member.fsf.org>
;;; Copyright © 2014, 2015 Federico Beffa <beffa@fbengineering.ch>
@ -4175,7 +4175,20 @@ (define-public upower
(sha256
(base32
"1vxxvmz2cxb1qy6ibszaz5bskqdy9nd9fxspj9fv3gfmrjzzzdb4"))
(patches (search-patches "upower-builddir.patch"))))
(patches (search-patches "upower-builddir.patch"))
(modules '((guix build utils)))
(snippet
'(begin
;; 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/Makefile.in"
(("^dbusconfdir =.*$")
"dbusconfdir = $(sysconfdir)/dbus-1/system.d\n"))
#t))))
(build-system glib-or-gtk-build-system)
(arguments
'( ;; The tests want to contact the system bus, which can't be done in the