diff options
author | Tobias Geerinckx-Rice <me@tobias.gr> | 2022-01-06 01:15:11 +0100 |
---|---|---|
committer | Tobias Geerinckx-Rice <me@tobias.gr> | 2022-01-06 05:24:17 +0100 |
commit | 24b04f5d4e82284a48f07213bd02b83401db8898 (patch) | |
tree | 5e087281030b419456a473105a4110c5e502d604 /gnu/packages | |
parent | 7a96516f60e39c360a7416ac890f93f6e5f7e5f2 (diff) |
gnu: toybox: Use G-expressions.
* gnu/packages/busybox.scm (toybox)[arguments]:
Rewrite as G-expressions.
Diffstat (limited to 'gnu/packages')
-rw-r--r-- | gnu/packages/busybox.scm | 56 |
1 files changed, 27 insertions, 29 deletions
diff --git a/gnu/packages/busybox.scm b/gnu/packages/busybox.scm index 33a343e576..7a548582f3 100644 --- a/gnu/packages/busybox.scm +++ b/gnu/packages/busybox.scm @@ -19,6 +19,7 @@ ;;; along with GNU Guix. If not, see <http://www.gnu.org/licenses/>. (define-module (gnu packages busybox) + #:use-module (guix gexp) #:use-module (guix licenses) #:use-module (guix packages) #:use-module (guix download) @@ -133,35 +134,32 @@ any small or embedded system.") "0jq3368jps6jg717ikzhlc6whml3k2s9xy69zpj4i0r35c5ck622")))) (build-system gnu-build-system) (arguments - `(#:phases - (modify-phases %standard-phases - (add-before 'configure 'set-environment-variables - (lambda _ - (setenv "CC" ,(cc-for-target)) - (setenv "HOSTCC" (which "gcc")))) - (replace 'configure - (lambda _ (invoke "make" "defconfig"))) - (add-before 'check 'fix-or-skip-broken-tests - (lambda _ - ;; Some tests expects $USER to magically be the current user name. - (setenv "USER" (passwd:name (getpwnam (geteuid)))) - ;; All these expect directories to be exactly 4K. They aren't! - (delete-file "tests/du.test") - ;; Delete tests that expect a root or 0 user to exist. - (substitute* "tests/id.test" - (("^testing .*[ \\(]root.*") "")) - )) - (replace 'install - (lambda* (#:key outputs #:allow-other-keys) - (let ((out (assoc-ref outputs "out"))) - (invoke "make" - (string-append "PREFIX=" out) - "install")))) - (add-after 'install 'remove-usr-directory - (lambda* (#:key outputs #:allow-other-keys) - (let ((out (assoc-ref outputs "out"))) - (delete-file-recursively (string-append out "/usr")))))) - #:test-target "tests")) + (list #:phases + #~(modify-phases %standard-phases + (add-before 'configure 'set-environment-variables + (lambda _ + (setenv "CC" #$(cc-for-target)) + (setenv "HOSTCC" (which "gcc")))) + (replace 'configure + (lambda _ (invoke "make" "defconfig"))) + (add-before 'check 'fix-or-skip-broken-tests + (lambda _ + ;; Some tests expect $USER to magically be the current user. + (setenv "USER" (passwd:name (getpwnam (geteuid)))) + ;; This expects directories to be exactly 4K. They aren't! + (delete-file "tests/du.test") + ;; Delete tests that expect a root or 0 user to exist. + (substitute* "tests/id.test" + (("^testing .*[ \\(]root.*") "")))) + (replace 'install + (lambda* (#:key outputs #:allow-other-keys) + (invoke "make" + (string-append "PREFIX=" #$output) + "install"))) + (add-after 'install 'remove-usr-directory + (lambda* (#:key outputs #:allow-other-keys) + (delete-file-recursively (string-append #$output "/usr"))))) + #:test-target "tests")) (native-inputs (list bc)) (synopsis "Many common UNIX utilities in a single executable") (description "ToyBox combines tiny versions of many common UNIX utilities |