From 932e7204afbe6d56b8319f7c298ea43e12004a95 Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Sat, 13 Jun 2015 19:31:24 +0200 Subject: gnu: guix: Wrap 'guix' so GUILE_LOAD_PATH includes the dependencies. * gnu/packages/package-management.scm (guix-0.8.2)[arguments]: Add 'wrap-program' phase. --- gnu/packages/package-management.scm | 17 ++++++++++++++++- 1 file changed, 16 insertions(+), 1 deletion(-) (limited to 'gnu/packages/package-management.scm') diff --git a/gnu/packages/package-management.scm b/gnu/packages/package-management.scm index 33dce5c809..7f6ec56151 100644 --- a/gnu/packages/package-management.scm +++ b/gnu/packages/package-management.scm @@ -99,7 +99,22 @@ (define (copy arch) (copy "x86_64") (copy "mips64el") (copy "armhf") - #t))))) + #t)) + (add-after + 'install 'wrap-program + (lambda* (#:key inputs outputs #:allow-other-keys) + ;; Make sure the 'guix' command finds GnuTLS and + ;; Guile-JSON automatically. + (let* ((out (assoc-ref outputs "out")) + (json (assoc-ref inputs "guile-json")) + (gnutls (assoc-ref inputs "gnutls")) + (path (string-append + json "/share/guile/site/2.0:" + gnutls "/share/guile/site/2.0"))) + (wrap-program (string-append out "/bin/guix") + `("GUILE_LOAD_PATH" ":" prefix (,path)) + `("GUILE_LOAD_COMPILED_PATH" ":" prefix (,path))) + #t)))))) (native-inputs `(("pkg-config" ,pkg-config) ("emacs" ,emacs-no-x))) ;for guix.el (inputs -- cgit v1.2.3