diff options
| author | Ludovic Courtès <ludo@gnu.org> | 2013-01-02 22:44:58 +0100 |
|---|---|---|
| committer | Ludovic Courtès <ludo@gnu.org> | 2013-01-02 22:46:26 +0100 |
| commit | 8ba8aeb74d3f45fb46a69d2278086e3a44845b4a (patch) | |
| tree | 2eaea992aba07b58fa8caabaddd6c194817f362f /distro | |
| parent | 2ea2baf16c63c8f98f5aa5d557a87b5dd53f3423 (diff) | |
| download | patches-8ba8aeb74d3f45fb46a69d2278086e3a44845b4a.tar patches-8ba8aeb74d3f45fb46a69d2278086e3a44845b4a.tar.gz | |
distro: coreutils: Enable tests; add dependency on ACL and GMP.
* distro/packages/base.scm (coreutils): Set #:parallel-build? #f. Add
`patch-shell-references' phase. Add 'acl', 'gmp', and 'perl' as
inputs, as suggested by Nikita Karetnikov.
Diffstat (limited to 'distro')
| -rw-r--r-- | distro/packages/base.scm | 21 |
1 files changed, 18 insertions, 3 deletions
diff --git a/distro/packages/base.scm b/distro/packages/base.scm index ad9561b5f4..2190fc528c 100644 --- a/distro/packages/base.scm +++ b/distro/packages/base.scm @@ -20,6 +20,7 @@ (define-module (distro packages base) #:use-module (guix licenses) #:use-module (distro) + #:use-module (distro packages acl) #:use-module (distro packages bash) #:use-module (distro packages bootstrap) #:use-module (distro packages compression) @@ -272,10 +273,24 @@ The tools supplied with this package are: (base32 "1cly97xdy3v4nbbx631k43smqw0nnpn651kkprs0yyl2cj3pkjyv")))) (build-system gnu-build-system) - (inputs `()) ; TODO: optional deps: SELinux, ACL, GMP + (inputs `(("acl" ,acl) + ("gmp" ,gmp) + ("perl" ,perl))) ; TODO: add SELinux (arguments - '(;; Perl is missing, and some tests are failing. - #:tests? #f)) + `(#:parallel-build? #f ; help2man may be called too early + #:phases (alist-cons-before + 'build 'patch-shell-references + (lambda* (#:key inputs #:allow-other-keys) + (let ((bash (assoc-ref inputs "bash"))) + (substitute* (cons "src/split.c" + (find-files "gnulib-tests" + "\\.c$")) + (("/bin/sh") + (format #f "~a/bin/sh" bash))) + (substitute* (find-files "tests" "\\.sh$") + (("#!/bin/sh") + (format #f "#!~a/bin/bash" bash))))) + %standard-phases))) (synopsis "The basic file, shell and text manipulation utilities of the GNU operating system") |