[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
02/05: gnu: enlightenment: Use system eject.
From: |
guix-commits |
Subject: |
02/05: gnu: enlightenment: Use system eject. |
Date: |
Tue, 1 Sep 2020 08:56:08 -0400 (EDT) |
efraim pushed a commit to branch master
in repository guix.
commit e8ae96ae61d125940d832df5c898bec307109f83
Author: Efraim Flashner <efraim@flashner.co.il>
AuthorDate: Tue Sep 1 15:35:41 2020 +0300
gnu: enlightenment: Use system eject.
* gnu/packages/enlightenment.scm (enlightenment)[arguments]: Adjust
'set-system-actions phase to refer to eject in /run/current-system.
[native-inputs]: Remove util-linux.
---
gnu/packages/enlightenment.scm | 6 ++----
1 file changed, 2 insertions(+), 4 deletions(-)
diff --git a/gnu/packages/enlightenment.scm b/gnu/packages/enlightenment.scm
index f447b02..cb72f3b 100644
--- a/gnu/packages/enlightenment.scm
+++ b/gnu/packages/enlightenment.scm
@@ -314,7 +314,6 @@ Libraries with some extra bells and whistles.")
(setenv "HOME" "/tmp")
(let ((xkeyboard (assoc-ref inputs "xkeyboard-config"))
(setxkbmap (assoc-ref inputs "setxkbmap"))
- (utils (assoc-ref inputs "util-linux"))
(libc (assoc-ref inputs "libc"))
(bc (assoc-ref inputs "bc"))
(efl (assoc-ref inputs "efl")))
@@ -345,14 +344,13 @@ Libraries with some extra bells and whistles.")
(substitute* "data/etc/meson.build"
(("/bin/mount") "/run/setuid-programs/mount")
(("/bin/umount") "/run/setuid-programs/umount")
- (("/usr/bin/eject") (string-append utils "/bin/eject")))
+ (("/usr/bin/eject") "/run/current-system/profile/bin/eject"))
(substitute* "src/bin/system/e_system_power.c"
(("systemctl") "loginctl"))
#t))))))
(native-inputs
`(("gettext" ,gettext-minimal)
- ("pkg-config" ,pkg-config)
- ("util-linux" ,util-linux)))
+ ("pkg-config" ,pkg-config)))
(inputs
`(("alsa-lib" ,alsa-lib)
("bc" ,bc)