[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
03/03: gnu: guix: Always depend on the development dependencies.
From: |
Ludovic Courtès |
Subject: |
03/03: gnu: guix: Always depend on the development dependencies. |
Date: |
Sun, 30 Oct 2016 22:16:19 +0000 (UTC) |
civodul pushed a commit to branch master
in repository guix.
commit a7db8540a712b039aa518bfc4c58e7a6ce823858
Author: Ludovic Courtès <address@hidden>
Date: Sun Oct 30 23:06:06 2016 +0100
gnu: guix: Always depend on the development dependencies.
Suggested by Chris Marusich <address@hidden> at
<https://lists.gnu.org/archive/html/guix-devel/2016-10/msg00425.html>.
* gnu/packages/package-management.scm (guix-0.11.0)[native-inputs]: Add
Autoconf, Automake, Gettext, Texinfo, Graphviz, and Help2man.
(guix-devel)[native-inputs]: Remove.
---
gnu/packages/package-management.scm | 22 ++++++++++++----------
1 file changed, 12 insertions(+), 10 deletions(-)
diff --git a/gnu/packages/package-management.scm
b/gnu/packages/package-management.scm
index b437599..9759fc7 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" ,gnu-gettext)
- ("texinfo" ,texinfo)
- ("graphviz" ,graphviz)
- ("help2man" ,help2man)
- ,@(package-native-inputs guix-0.11.0))))))
+ (zero? (system* "sh" "bootstrap")))))))))))
(define-public guix guix-devel)