From af07095516b56dcdd38bf1874da27de9c4c841f6 Mon Sep 17 00:00:00 2001
From: Ludovic Courtès <ludo@gnu.org>
Date: Sat, 27 Dec 2014 23:22:08 +0100
Subject: packages: Add 'file-type' field to 'search-path-specification'.

Fixes <http://bugs.gnu.org/18033>.

* guix/packages.scm (<search-path-specification>): Rename 'directories'
  field to 'files'.  Add 'file-type'.
  (search-path-specification->sexp): Honor 'file-type'.
* gnu/packages/autotools.scm, gnu/packages/bootstrap.scm,
  gnu/packages/cross-base.scm, gnu/packages/games.scm,
  gnu/packages/gcc.scm, gnu/packages/glib.scm,
  gnu/packages/guile.scm, gnu/packages/man.scm,
  gnu/packages/perl.scm, gnu/packages/pkg-config.scm,
  gnu/packages/python.scm, gnu/packages/ruby.scm,
  gnu/packages/xfce.scm: Change 'directories' to 'files'.
* tests/packages.scm ("search paths"): Change 'directories' field to
  'files'.
* guix/scripts/environment.scm (for-each-search-path): Likewise.
---
 guix/packages.scm            | 10 +++++-----
 guix/scripts/environment.scm |  3 +--
 2 files changed, 6 insertions(+), 7 deletions(-)

(limited to 'guix')

diff --git a/guix/packages.scm b/guix/packages.scm
index ed9a565dc6..b375895785 100644
--- a/guix/packages.scm
+++ b/guix/packages.scm
@@ -172,16 +172,16 @@ representation."
   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 c388b0c52c..412b8be658 100644
--- a/guix/scripts/environment.scm
+++ b/guix/scripts/environment.scm
@@ -54,8 +54,7 @@ path value is appended."
                             value)))))
               (cons* (search-path-specification
                       (variable "PATH")
-                      (directories '("bin" "sbin"))
-                      (separator ":"))
+                      (files '("bin" "sbin")))
                      (delete-duplicates
                       (append-map package-native-search-paths inputs))))))
 
-- 
cgit v1.2.3