diff options
| author | Marius Bakke <mbakke@fastmail.com> | 2020-04-30 23:47:49 +0200 |
|---|---|---|
| committer | Marius Bakke <mbakke@fastmail.com> | 2020-04-30 23:47:49 +0200 |
| commit | 8bf8cd9b85c85be387565f6c8ca9f6c72196fb8e (patch) | |
| tree | 6fa0f8ba32b83a996625bc188903ccebfb7e7c2c /gnu/packages/admin.scm | |
| parent | 5d9e2187929ed7e8d46ec3cb3174fd78c1846360 (diff) | |
| parent | 229f4fa9522fb56b014ee9c0d8111e8fb6da764d (diff) | |
| download | guix-patches-8bf8cd9b85c85be387565f6c8ca9f6c72196fb8e.tar guix-patches-8bf8cd9b85c85be387565f6c8ca9f6c72196fb8e.tar.gz | |
Merge branch 'master' into core-updates
Conflicts:
gnu/local.mk
gnu/packages/backup.scm
gnu/packages/emacs-xyz.scm
gnu/packages/guile.scm
gnu/packages/lisp.scm
gnu/packages/openldap.scm
gnu/packages/package-management.scm
gnu/packages/web.scm
gnu/packages/xorg.scm
Diffstat (limited to 'gnu/packages/admin.scm')
| -rw-r--r-- | gnu/packages/admin.scm | 14 |
1 files changed, 6 insertions, 8 deletions
diff --git a/gnu/packages/admin.scm b/gnu/packages/admin.scm index 8d8c6a4b94..cd9901d5bf 100644 --- a/gnu/packages/admin.scm +++ b/gnu/packages/admin.scm @@ -152,24 +152,22 @@ (list "--enable-sudo=yes") #:phases (modify-phases %standard-phases - (add-after 'unpack 'patch-sudo-path - (lambda* (#:key inputs #:allow-other-keys) + (add-after 'unpack 'patch-file-names + (lambda _ (substitute* "configure.ac" + (("supath=`which su 2>/dev/null`") + "supath=/run/setuid-programs/su") (("sudopath=`which sudo 2>/dev/null`") - (string-append "sudopath=" - (string-append (assoc-ref inputs "sudo") - "/bin/sudo")))) + "sudopath=/run/setuid-programs/sudo")) #t))))) (native-inputs `(("autoconf" ,autoconf) - ("autogen" ,autogen) ("automake" ,automake) ("libtool" ,libtool) ("pkg-config" ,pkg-config))) (inputs `(("glib" ,glib) - ("gtk+" ,gtk+-2) - ("sudo" ,sudo))) + ("gtk+" ,gtk+-2))) (synopsis "Graphical front end for @command{su}") (description "Ktsuss stands for ``Keep the @command{su} simple, stupid''. |