nixo
/
guix-devel
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

gnu: accountsservice: Properly reference shadow. 

* gnu/packages/freedesktop.scm (accountsservice): Fix references to binaries
  provided by the shadow package.
This commit is contained in:
Andy Wingo 2017-08-22 14:05:58 +02:00
parent cb8b14f182
commit e76008dbc8
No known key found for this signature in database
GPG Key ID: A8803732E4436885
1 changed files with 12 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
gnu/packages/freedesktop.scm
View File

@ -1,7 +1,7 @@
;;; GNU Guix --- Functional package management for GNU ;;; GNU Guix --- Functional package management for GNU
;;; Copyright © 2015 Andreas Enge <andreas@enge.fr> ;;; Copyright © 2015 Andreas Enge <andreas@enge.fr>
;;; Copyright © 2015 Sou Bunnbu <iyzsong@gmail.com> ;;; Copyright © 2015 Sou Bunnbu <iyzsong@gmail.com>
;;; Copyright © 2015 Andy Wingo <wingo@pobox.com> ;;; Copyright © 2015, 2017 Andy Wingo <wingo@pobox.com>
;;; Copyright © 2015, 2016, 2017 Ludovic Courtès <ludo@gnu.org> ;;; Copyright © 2015, 2016, 2017 Ludovic Courtès <ludo@gnu.org>
;;; Copyright © 2015 Ricardo Wurmus <rekado@elephly.net> ;;; Copyright © 2015 Ricardo Wurmus <rekado@elephly.net>
;;; Copyright © 2015 David Hashe <david.hashe@dhashe.com> ;;; Copyright © 2015 David Hashe <david.hashe@dhashe.com>
@ -645,10 +645,17 @@ message bus.")
(modify-phases %standard-phases (modify-phases %standard-phases
(add-before (add-before
'configure 'pre-configure 'configure 'pre-configure
(lambda _ (lambda* (#:key inputs #:allow-other-keys)
;; Don't try to create /var/lib/AccoutsService. ;; Don't try to create /var/lib/AccountsService.
(substitute* "src/Makefile.in" (substitute* "src/Makefile.in"
(("\\$\\(MKDIR_P\\).*/lib/AccountsService.*") "true")) (("\\$\\(MKDIR_P\\).*/lib/AccountsService.*") "true"))
(let ((shadow (assoc-ref inputs "shadow")))
(substitute* '("src/user.c" "src/daemon.c")
(("/usr/sbin/usermod") (string-append shadow "/sbin/usermod"))
(("/usr/sbin/useradd") (string-append shadow "/sbin/useradd"))
(("/usr/sbin/userdel") (string-append shadow "/sbin/userdel"))
(("/usr/bin/passwd") (string-append shadow "/bin/passwd"))
(("/usr/bin/chage") (string-append shadow "/bin/chage"))))
#t))))) #t)))))
(native-inputs (native-inputs
`(("glib:bin" ,glib "bin") ; for gdbus-codegen, etc. `(("glib:bin" ,glib "bin") ; for gdbus-codegen, etc.
@ -656,7 +663,8 @@ message bus.")
("intltool" ,intltool) ("intltool" ,intltool)
("pkg-config" ,pkg-config))) ("pkg-config" ,pkg-config)))
(inputs (inputs
`(("polkit" ,polkit))) `(("shadow" ,shadow)
("polkit" ,polkit)))
(home-page "http://www.freedesktop.org/wiki/Software/AccountsService/") (home-page "http://www.freedesktop.org/wiki/Software/AccountsService/")
(synopsis "D-Bus interface for user account query and manipulation") (synopsis "D-Bus interface for user account query and manipulation")
(description (description