[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
02/04: profiles: Honor search paths of propagated inputs.
From: |
Ludovic Court�s |
Subject: |
02/04: profiles: Honor search paths of propagated inputs. |
Date: |
Sun, 20 Dec 2015 21:34:36 +0000 |
civodul pushed a commit to branch master
in repository guix.
commit ccda8f7d7f95a9db0e1163857faf74800f368ac1
Author: Ludovic Courtès <address@hidden>
Date: Sun Dec 20 14:42:56 2015 +0100
profiles: Honor search paths of propagated inputs.
Fixes <http://bugs.gnu.org/22073>.
Reported by Federico Beffa <address@hidden>.
* guix/profiles.scm (package->manifest-entry): Use
'package-transitive-native-search-paths' when computing
'search-paths' field.
* tests/profiles.scm ("package->manifest-entry, search paths"): New test.
---
guix/profiles.scm | 2 +-
tests/profiles.scm | 9 +++++++++
2 files changed, 10 insertions(+), 1 deletions(-)
diff --git a/guix/profiles.scm b/guix/profiles.scm
index ce6b2c4..ce86ff8 100644
--- a/guix/profiles.scm
+++ b/guix/profiles.scm
@@ -176,7 +176,7 @@ omitted or #f, use the first output of PACKAGE."
(output (or output (car (package-outputs package))))
(item package)
(dependencies (delete-duplicates deps))
- (search-paths (package-native-search-paths package)))))
+ (search-paths (package-transitive-native-search-paths package)))))
(define (packages->manifest packages)
"Return a list of manifest entries, one for each item listed in PACKAGES.
diff --git a/tests/profiles.scm b/tests/profiles.scm
index cc9a822..e659c2e 100644
--- a/tests/profiles.scm
+++ b/tests/profiles.scm
@@ -32,6 +32,7 @@
#:use-module (ice-9 regex)
#:use-module (ice-9 popen)
#:use-module (rnrs io ports)
+ #:use-module (srfi srfi-1)
#:use-module (srfi srfi-11)
#:use-module (srfi srfi-64))
@@ -224,6 +225,14 @@
(package-native-search-paths
packages:guile-2.0)))))))))
+(test-assert "package->manifest-entry, search paths"
+ ;; See <http://bugs.gnu.org/22073>.
+ (let ((mpl (@ (gnu packages python) python2-matplotlib)))
+ (lset= eq?
+ (package-transitive-native-search-paths mpl)
+ (manifest-entry-search-paths
+ (package->manifest-entry mpl)))))
+
(test-assertm "etc/profile"
;; Make sure we get an 'etc/profile' file that at least defines $PATH.
(mlet* %store-monad