guix_mirror_bot pushed a commit to branch master
in repository guix.
commit 5fd4df347e04b6cd3ce3fc91900f773a2e4824e3
Author: Morgan Smith <[email protected]>
AuthorDate: Thu Jun 5 11:42:14 2025 -0400
gnu: tlp: Fix scripts.
tlp provides a number of executables. Before this change the "tlp" and
"tlp-stat"
executables worked fine but the "bluetooth", "nfc", "run-on-ac",
"run-on-bat",
"wifi", and "wwan" executables would give strange warnings.
* gnu/packages/linux.scm (tlp): Fix scripts.
<phases> [wrap]: Use wrap-script instead of wrap-program to preserve shell
argument "$0". Don't wrap symlinks.
<inputs>: Add guile-3.0 for wrap-script. Remove bash used for now removed
wrap-program.
Change-Id: I916a4385cb69db142f834839aa9aaf0d81085714
Signed-off-by: Ludovic Courtès <[email protected]>
---
gnu/packages/linux.scm | 16 +++++++++++-----
1 file changed, 11 insertions(+), 5 deletions(-)
diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm
index baf3b17b1c..7d991af25e 100644
--- a/gnu/packages/linux.scm
+++ b/gnu/packages/linux.scm
@@ -145,6 +145,7 @@
#:use-module (gnu packages graphviz)
#:use-module (gnu packages gstreamer)
#:use-module (gnu packages gtk)
+ #:use-module (gnu packages guile)
#:use-module (gnu packages haskell-apps)
#:use-module (gnu packages haskell-xyz)
#:use-module (gnu packages image)
@@ -8538,11 +8539,11 @@ interface in sysfs, which can be accomplished with the
included udev rules.")
(native-inputs
(list shellcheck))
(inputs
- `(("bash" ,bash)
- ("dbus" ,dbus)
+ `(("dbus" ,dbus)
("ethtool" ,ethtool)
("eudev" ,eudev)
("grep" ,grep)
+ ("guile" ,guile-3.0) ;for wrap-script
("hdparm" ,hdparm)
("inetutils" ,inetutils)
("iw" ,iw)
@@ -8600,15 +8601,20 @@ interface in sysfs, which can be accomplished with the
included udev rules.")
(lambda* (#:key inputs outputs #:allow-other-keys)
(let* ((bin (string-append (assoc-ref outputs "out") "/bin"))
(sbin (string-append (assoc-ref outputs "out") "/sbin"))
- (bin-files (find-files bin ".*"))
- (sbin-files (find-files sbin ".*")))
+ ;; Used to ignore symlinks which don't need wrapping
+ (regular-file-predicate
+ (lambda (file stat) (eq? 'regular (stat:type stat))))
+ (bin-files (find-files bin regular-file-predicate))
+ (sbin-files (find-files sbin regular-file-predicate)))
(define (bin-directory input-name)
(let ((p (assoc-ref inputs input-name)))
(and p (string-append p "/bin"))))
(define (sbin-directory input-name)
(string-append (assoc-ref inputs input-name) "/sbin"))
(for-each (lambda (program)
- (wrap-program program
+ ;; Programs rely on $0 so we use wrap-script
+ ;; instead of wrap-program
+ (wrap-script program
`("PATH" ":" prefix
,(append
(filter-map bin-directory
