diff options
| author | Jakub Kądziołka <kuba@kadziolka.net> | 2020-07-23 21:43:06 +0200 |
|---|---|---|
| committer | Jakub Kądziołka <kuba@kadziolka.net> | 2020-07-23 21:43:06 +0200 |
| commit | d726b954baaeff876ce9728e00920fa45f529f9a (patch) | |
| tree | 4b767b7586a1082dd2691bc33c3e45ace044e6e5 /gnu/packages/busybox.scm | |
| parent | 9a74a7db8626bc139307d115f5cec2648f5273ad (diff) | |
| parent | e165a2492d73d37c8b95d6970d453b9d88911ee6 (diff) | |
| download | guix-d726b954baaeff876ce9728e00920fa45f529f9a.tar.gz guix-d726b954baaeff876ce9728e00920fa45f529f9a.zip | |
Merge branch 'master' into core-updates
Conflicts:
gnu/packages/ruby.scm
Diffstat (limited to 'gnu/packages/busybox.scm')
| -rw-r--r-- | gnu/packages/busybox.scm | 15 |
1 files changed, 8 insertions, 7 deletions
diff --git a/gnu/packages/busybox.scm b/gnu/packages/busybox.scm index 305a61f40b..0a93c6475e 100644 --- a/gnu/packages/busybox.scm +++ b/gnu/packages/busybox.scm @@ -60,7 +60,8 @@ (("default y") "default n")) #t)) (replace 'configure - (lambda _ (invoke "make" "defconfig"))) + (lambda* (#:key make-flags #:allow-other-keys) + (apply invoke "make" "defconfig" make-flags))) (add-after 'configure 'dont-install-to-usr (lambda _ (substitute* ".config" @@ -68,7 +69,7 @@ "CONFIG_INSTALL_NO_USR=y")) #t)) (replace 'check - (lambda _ + (lambda* (#:key make-flags #:allow-other-keys) (substitute* '("testsuite/du/du-s-works" "testsuite/du/du-works") (("/bin") "/etc")) ; there is no /bin but there is a /etc @@ -96,17 +97,17 @@ (delete-file "testsuite/which/which-uses-default-path") (rmdir "testsuite/which") - (invoke "make" + (apply invoke "make" ;; "V=1" "SKIP_KNOWN_BUGS=1" "SKIP_INTERNET_TESTS=1" - "check"))) + "check" make-flags))) (replace 'install - (lambda* (#:key outputs #:allow-other-keys) + (lambda* (#:key outputs make-flags #:allow-other-keys) (let ((out (assoc-ref outputs "out"))) - (invoke "make" + (apply invoke "make" (string-append "CONFIG_PREFIX=" out) - "install"))))))) + "install" make-flags))))))) (native-inputs `(("perl" ,perl) ; needed to generate the man pages (pod2man) ;; The following are needed by the tests. ("inetutils" ,inetutils) |