diff --git a/gnu/packages/autotools.scm b/gnu/packages/autotools.scm
index 0094577210f5f0a8e74b432db4a18e17a451a3d2..a3afcdcfff1b8e863b55f0861a94ab3fe9df27de 100644
--- a/gnu/packages/autotools.scm
+++ b/gnu/packages/autotools.scm
@@ -178,7 +178,7 @@ (define-public automake
(native-search-paths
(list (search-path-specification
(variable "ACLOCAL_PATH")
- (directories '("share/aclocal")))))
+ (files '("share/aclocal")))))
(arguments
'(#:modules ((guix build gnu-build-system)
(guix build utils)
diff --git a/gnu/packages/bootstrap.scm b/gnu/packages/bootstrap.scm
index 854d97bcfb4757fa804c368b45d83c72a8be6559..5a19783bb62032b67878ce6222bccd7955c048e1 100644
--- a/gnu/packages/bootstrap.scm
+++ b/gnu/packages/bootstrap.scm
@@ -409,10 +409,10 @@ (define %bootstrap-gcc
(native-search-paths
(list (search-path-specification
(variable "CPATH")
- (directories '("include")))
+ (files '("include")))
(search-path-specification
(variable "LIBRARY_PATH")
- (directories '("lib" "lib64")))))
+ (files '("lib" "lib64")))))
(synopsis "Bootstrap binaries of the GNU Compiler Collection")
(description #f)
(home-page #f)
diff --git a/gnu/packages/cross-base.scm b/gnu/packages/cross-base.scm
index 74809d08f99dd9e5a2ec8a00b40fbd0b42fbaf59..0f32c9fab917f108df7c664f8290b9f2fb588b67 100644
--- a/gnu/packages/cross-base.scm
+++ b/gnu/packages/cross-base.scm
@@ -234,10 +234,10 @@ (define* (cross-gcc target
(search-paths
(list (search-path-specification
(variable "CROSS_CPATH")
- (directories '("include")))
+ (files '("include")))
(search-path-specification
(variable "CROSS_LIBRARY_PATH")
- (directories '("lib" "lib64")))))
+ (files '("lib" "lib64")))))
(native-search-paths '())))
(define* (cross-libc target
diff --git a/gnu/packages/games.scm b/gnu/packages/games.scm
index db878b033da40d8edcc1257b5b8df36a94e2a439..99a4a78c1199ce7c711a20de3cdd0c8aa05ad6f3 100644
--- a/gnu/packages/games.scm
+++ b/gnu/packages/games.scm
@@ -706,7 +706,7 @@ (define-public minetest
(native-search-paths
(list (search-path-specification
(variable "MINETEST_SUBGAME_PATH")
- (directories '("share/minetest/games")))))
+ (files '("share/minetest/games")))))
(native-inputs
`(("pkg-config" ,pkg-config)))
(inputs
diff --git a/gnu/packages/gcc.scm b/gnu/packages/gcc.scm
index 4b715f495e9cb7866783248a44a4451c72cff21a..e795f9749fb46d43b31252f420cc333dd784532e 100644
--- a/gnu/packages/gcc.scm
+++ b/gnu/packages/gcc.scm
@@ -245,10 +245,10 @@ (define-public gcc-4.7
(native-search-paths
(list (search-path-specification
(variable "CPATH")
- (directories '("include")))
+ (files '("include")))
(search-path-specification
(variable "LIBRARY_PATH")
- (directories '("lib" "lib64")))))
+ (files '("lib" "lib64")))))
(properties `((gcc-libc . ,(assoc-ref inputs "libc"))))
(synopsis "GNU Compiler Collection")
diff --git a/gnu/packages/glib.scm b/gnu/packages/glib.scm
index 486cdb6addaee8503fdc214decaf4c59564dc1c2..93b465b130c2a60a59a1c21ce664db6918fb1a67 100644
--- a/gnu/packages/glib.scm
+++ b/gnu/packages/glib.scm
@@ -183,7 +183,7 @@ (define glib
;; by 'glib-compile-schemas'.
(list (search-path-specification
(variable "XDG_DATA_DIRS")
- (directories '("share")))))
+ (files '("share")))))
(search-paths native-search-paths)
(synopsis "Thread-safe general utility library; basis of GTK+ and GNOME")
@@ -225,7 +225,7 @@ (define gobject-introspection
(native-search-paths
(list (search-path-specification
(variable "GI_TYPELIB_PATH")
- (directories '("lib/girepository-1.0")))))
+ (files '("lib/girepository-1.0")))))
(search-paths native-search-paths)
(arguments
`(#:phases
diff --git a/gnu/packages/guile.scm b/gnu/packages/guile.scm
index 6a76bafe84eb8457c4a8a7a67747fe7c8befdf50..7e3b5f847d0b53ac9f68df8d35da6d908fc31c40 100644
--- a/gnu/packages/guile.scm
+++ b/gnu/packages/guile.scm
@@ -95,7 +95,7 @@ (define-public guile-1.8
(native-search-paths
(list (search-path-specification
(variable "GUILE_LOAD_PATH")
- (directories '("share/guile/site")))))
+ (files '("share/guile/site")))))
(synopsis "Scheme implementation intended especially for extensions")
(description
@@ -155,10 +155,10 @@ (define-public guile-2.0
(native-search-paths
(list (search-path-specification
(variable "GUILE_LOAD_PATH")
- (directories '("share/guile/site/2.0")))
+ (files '("share/guile/site/2.0")))
(search-path-specification
(variable "GUILE_LOAD_COMPILED_PATH")
- (directories '("share/guile/site/2.0")))))
+ (files '("share/guile/site/2.0")))))
(synopsis "Scheme implementation intended especially for extensions")
(description
diff --git a/gnu/packages/man.scm b/gnu/packages/man.scm
index 028403ce74658780c28ed17f0aef2d401f862d86..712622aee8c99ee6cef7aa6b53a60063b5b40c14 100644
--- a/gnu/packages/man.scm
+++ b/gnu/packages/man.scm
@@ -105,7 +105,7 @@ (define-public man-db
(native-search-paths
(list (search-path-specification
(variable "MANPATH")
- (directories '("share/man")))))
+ (files '("share/man")))))
(home-page "http://man-db.nongnu.org/")
(synopsis "Standard Unix documentation system")
(description
diff --git a/gnu/packages/perl.scm b/gnu/packages/perl.scm
index 03cad3e25fd7148a4cbe7ee147283cb3f83c84fc..699fe751def3c62387bb7ca774314cbf69d360b9 100644
--- a/gnu/packages/perl.scm
+++ b/gnu/packages/perl.scm
@@ -66,7 +66,7 @@ (define-public perl
%standard-phases)))
(native-search-paths (list (search-path-specification
(variable "PERL5LIB")
- (directories '("lib/perl5/site_perl")))))
+ (files '("lib/perl5/site_perl")))))
(synopsis "Implementation of the Perl programming language")
(description
"Perl 5 is a highly capable, feature-rich programming language with over
diff --git a/gnu/packages/pkg-config.scm b/gnu/packages/pkg-config.scm
index dc4905a2711251d20b6d4b0c0463933c4a451c43..dd5120c4747b482e95e9f4f14fb578aa2c150204 100644
--- a/gnu/packages/pkg-config.scm
+++ b/gnu/packages/pkg-config.scm
@@ -44,8 +44,7 @@ (define-public %pkg-config
(native-search-paths
(list (search-path-specification
(variable "PKG_CONFIG_PATH")
- (directories '("lib/pkgconfig" "lib64/pkgconfig"
- "share/pkgconfig")))))
+ (files '("lib/pkgconfig" "lib64/pkgconfig" "share/pkgconfig")))))
(home-page "http://www.freedesktop.org/wiki/Software/pkg-config")
(license gpl2+)
(synopsis "Helper tool used when compiling applications and libraries")
diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm
index adb84fc5b79327d681a32c4042b85af281fd9db2..90e1f8948c342fc5c0d3501b71f5c3fd9f2753f1 100644
--- a/gnu/packages/python.scm
+++ b/gnu/packages/python.scm
@@ -198,7 +198,7 @@ (define-public python-2
(native-search-paths
(list (search-path-specification
(variable "PYTHONPATH")
- (directories '("lib/python2.7/site-packages")))))
+ (files '("lib/python2.7/site-packages")))))
(home-page "http://python.org")
(synopsis
"High-level, dynamically-typed programming language")
@@ -237,7 +237,7 @@ (define-public python
(native-search-paths
(list (search-path-specification
(variable "PYTHONPATH")
- (directories '("lib/python3.3/site-packages")))))))
+ (files '("lib/python3.3/site-packages")))))))
(define-public python-wrapper
(package (inherit python)
diff --git a/gnu/packages/ruby.scm b/gnu/packages/ruby.scm
index 4b6665cb6bd51edf4cd8cac3e854a21e632c3d19..f8276db698adce3efd76b60844eaa9d35cca26f0 100644
--- a/gnu/packages/ruby.scm
+++ b/gnu/packages/ruby.scm
@@ -77,10 +77,9 @@ (define-public ruby
(native-search-paths
(list (search-path-specification
(variable "GEM_PATH")
- (directories
- (list (string-append "lib/ruby/gems/"
- (version-major+minor version)
- ".0"))))))
+ (files (list (string-append "lib/ruby/gems/"
+ (version-major+minor version)
+ ".0"))))))
(synopsis "Programming language interpreter")
(description "Ruby is a dynamic object-oriented programming language with
a focus on simplicity and productivity.")
diff --git a/gnu/packages/xfce.scm b/gnu/packages/xfce.scm
index 2b15c3e35c3f767481c61ef01a3142f3db9a79d5..17b2b4d9f7722e5ceef59cf08617642b8bc996fe 100644
--- a/gnu/packages/xfce.scm
+++ b/gnu/packages/xfce.scm
@@ -267,7 +267,7 @@ (define-public xfce4-panel
(native-search-paths
(list (search-path-specification
(variable "X_XFCE4_LIB_DIRS")
- (directories '("lib/xfce4")))))
+ (files '("lib/xfce4")))))
(home-page "http://www.xfce.org/")
(synopsis "Xfce desktop panel")
(description
diff --git a/guix/packages.scm b/guix/packages.scm
index ed9a565dc62192cbf39e1f59c0a5ecfa841e6cac..b375895785bf38b3b84990ef94e995f9c9ca0be3 100644
--- a/guix/packages.scm
+++ b/guix/packages.scm
@@ -172,16 +172,16 @@ (define-record-type* <search-path-specification>
search-path-specification make-search-path-specification
search-path-specification?
(variable search-path-specification-variable)
- (directories search-path-specification-directories)
- (separator search-path-specification-separator (default ":")))
+ (files search-path-specification-files)
+ (separator search-path-specification-separator (default ":"))
+ (file-type search-path-specification-file-type (default 'directory)))
(define (search-path-specification->sexp spec)
"Return an sexp representing SPEC, a <search-path-specification>. The sexp
corresponds to the arguments expected by `set-path-environment-variable'."
(match spec
- (($ <search-path-specification> variable directories separator)
- ;; TODO: Allow other values of TYPE. See <http://bugs.gnu.org/18033>.
- `(,variable ,directories ,separator directory))))
+ (($ <search-path-specification> variable files separator type)
+ `(,variable ,files ,separator ,type))))
(define %supported-systems
;; This is the list of system types that are supported. By default, we
diff --git a/guix/scripts/environment.scm b/guix/scripts/environment.scm
index c388b0c52c200bfb95972250da5a24c000275651..412b8be658027b2828f2247dac5008b512f81d0c 100644
--- a/guix/scripts/environment.scm
+++ b/guix/scripts/environment.scm
@@ -54,8 +54,7 @@ (define (for-each-search-path proc inputs derivations pure?)
value)))))
(cons* (search-path-specification
(variable "PATH")
- (directories '("bin" "sbin"))
- (separator ":"))
+ (files '("bin" "sbin")))
(delete-duplicates
(append-map package-native-search-paths inputs))))))
diff --git a/tests/packages.scm b/tests/packages.scm
index 98fa9b5698ecc14f34afba055a201578e52ffe56..b2f09c6d6c5f857b7fae1830b47bfdd3367d3991 100644
--- a/tests/packages.scm
+++ b/tests/packages.scm
@@ -335,10 +335,10 @@ (define read-at
search-paths)))))))
(x (list (search-path-specification
(variable "GUILE_LOAD_PATH")
- (directories '("share/guile/site/2.0")))
+ (files '("share/guile/site/2.0")))
(search-path-specification
(variable "GUILE_LOAD_COMPILED_PATH")
- (directories '("share/guile/site/2.0")))))
+ (files '("share/guile/site/2.0")))))
(a (package (inherit (dummy-package "guile"))
(build-system s)
(native-search-paths x)))