diff options
| author | Leo Famulari <leo@famulari.name> | 2016-10-30 19:19:21 -0400 |
|---|---|---|
| committer | Leo Famulari <leo@famulari.name> | 2016-10-30 19:19:21 -0400 |
| commit | 205f0107bb894745ee740227c090ff90ee599915 (patch) | |
| tree | 08b2ddba47ce404468d6aba31b768e013dfb1fa3 /gnu/packages/package-management.scm | |
| parent | a8dd960ac0c68957dac281812f0d16f1295a6eaa (diff) | |
| parent | b89cbf5832fd920ef85002041bc690204b0174a3 (diff) | |
| download | gnu-guix-205f0107bb894745ee740227c090ff90ee599915.tar gnu-guix-205f0107bb894745ee740227c090ff90ee599915.tar.gz | |
Merge branch 'master' into core-updates
Diffstat (limited to 'gnu/packages/package-management.scm')
| -rw-r--r-- | gnu/packages/package-management.scm | 22 |
1 files changed, 12 insertions, 10 deletions
diff --git a/gnu/packages/package-management.scm b/gnu/packages/package-management.scm index 591f60307e..7c1ba846c9 100644 --- a/gnu/packages/package-management.scm +++ b/gnu/packages/package-management.scm @@ -159,7 +159,17 @@ #t)))))) (native-inputs `(("pkg-config" ,pkg-config) - ("emacs" ,emacs-minimal))) ;for guix.el + ("emacs" ,emacs-minimal) ;for guix.el + + ;; XXX: Keep the development inputs here even though + ;; they're unnecessary, just so that 'guix environment + ;; guix' always contains them. + ("autoconf" ,(autoconf-wrapper)) + ("automake" ,automake) + ("gettext" ,gnu-gettext) + ("texinfo" ,texinfo) + ("graphviz" ,graphviz) + ("help2man" ,help2man))) (inputs (let ((boot-guile (lambda (arch hash) (origin @@ -243,15 +253,7 @@ the Nix package manager.") (chmod po #o666)) (find-files "." "\\.po$")) - (zero? (system* "sh" "bootstrap")))))))) - (native-inputs - `(("autoconf" ,(autoconf-wrapper)) - ("automake" ,automake) - ("gettext" ,gettext-minimal) - ("texinfo" ,texinfo) - ("graphviz" ,graphviz) - ("help2man" ,help2man) - ,@(package-native-inputs guix-0.11.0)))))) + (zero? (system* "sh" "bootstrap"))))))))))) (define-public guix guix-devel) |