nixo
/
guix-devel
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

guix build: Augment %PATCH-PATH when -L is passed. 

Fixes <http://bugs.gnu.org/22259>.
Reported by Nikolay Merinov <nikolay.merinov@member.fsf.org>.

* guix/scripts/build.scm (%standard-build-options) <-L>: Augment
%PATCH-PATH.
* tests/guix-package.sh: Add test.
This commit is contained in:
Ludovic Courtès 2015-12-30 18:15:54 +01:00
parent 7a57c96a10
commit 223d793903
2 changed files with 5 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
guix/scripts/build.scm
View File

@ -204,6 +204,7 @@ options handled by 'set-build-options-from-command-line', and listed in
(lambda (opt name arg result . rest) (lambda (opt name arg result . rest)
;; XXX: Imperatively modify the search paths. ;; XXX: Imperatively modify the search paths.
(%package-module-path (cons arg (%package-module-path))) (%package-module-path (cons arg (%package-module-path)))
(%patch-path (cons arg (%patch-path)))
(set! %load-path (cons arg %load-path)) (set! %load-path (cons arg %load-path))
(set! %load-compiled-path (cons arg %load-compiled-path)) (set! %load-compiled-path (cons arg %load-compiled-path))

4
tests/guix-package.sh
View File

@ -225,6 +225,10 @@ cat > "$module_dir/foo.scm"<<EOF
EOF EOF
guix package -i emacs-foo-bar-patched -n guix package -i emacs-foo-bar-patched -n
# Same when -L is used.
( unset GUIX_PACKAGE_PATH; \
guix package -L "$module_dir" -i emacs-foo-bar-patched -n )
# Make sure installing from a file works. # Make sure installing from a file works.
cat > "$module_dir/package.scm"<<EOF cat > "$module_dir/package.scm"<<EOF
(use-modules (gnu)) (use-modules (gnu))