From 223d793903500f9e38ea9536a5b270ee7cf283f7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= <ludo@gnu.org>
Date: Wed, 30 Dec 2015 18:15:54 +0100
Subject: [PATCH] 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.
---
 guix/scripts/build.scm | 1 +
 tests/guix-package.sh  | 4 ++++
 2 files changed, 5 insertions(+)

diff --git a/guix/scripts/build.scm b/guix/scripts/build.scm
index a6596d0a82..9193ad32b2 100644
--- a/guix/scripts/build.scm
+++ b/guix/scripts/build.scm
@@ -204,6 +204,7 @@ options handled by 'set-build-options-from-command-line', and listed in
                 (lambda (opt name arg result . rest)
                   ;; XXX: Imperatively modify the search paths.
                   (%package-module-path (cons arg (%package-module-path)))
+                  (%patch-path (cons arg (%patch-path)))
                   (set! %load-path (cons arg %load-path))
                   (set! %load-compiled-path (cons arg %load-compiled-path))
 
diff --git a/tests/guix-package.sh b/tests/guix-package.sh
index bb1037044d..5e6ff8b012 100644
--- a/tests/guix-package.sh
+++ b/tests/guix-package.sh
@@ -225,6 +225,10 @@ cat > "$module_dir/foo.scm"<<EOF
 EOF
 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.
 cat > "$module_dir/package.scm"<<EOF
 (use-modules (gnu))