summary refs log tree commit diff
diff options
context:
space:
mode:
authorLudovic Courtès <ludo@gnu.org>2014-12-27 23:15:11 +0100
committerLudovic Courtès <ludo@gnu.org>2014-12-27 23:22:55 +0100
commit7b21fe538512b452c87389607f569668a7f1a1a4 (patch)
treeb4273dd4769a23cbd35bf262590e668af2b98943
parent7ec02d374d1fa8a8f4034a996485872fd2aa7b73 (diff)
downloadguix-7b21fe538512b452c87389607f569668a7f1a1a4.tar.gz
packages: Add 'file-pattern' field to 'search-path-specification'.
* guix/packages.scm (<search-path-specification>)[file-pattern]: New
  field.
  (search-path-specification->sexp): Honor it.
-rw-r--r--guix/packages.scm17
1 files changed, 10 insertions, 7 deletions
diff --git a/guix/packages.scm b/guix/packages.scm
index e299962a2e..68fd531c6b 100644
--- a/guix/packages.scm
+++ b/guix/packages.scm
@@ -171,18 +171,21 @@ representation."
 (define-record-type* <search-path-specification>
   search-path-specification make-search-path-specification
   search-path-specification?
-  (variable     search-path-specification-variable)
-  (files        search-path-specification-files)
-  (separator    search-path-specification-separator (default ":"))
-  (file-type    search-path-specification-file-type (default 'directory)))
+  (variable     search-path-specification-variable) ;string
+  (files        search-path-specification-files)    ;list of strings
+  (separator    search-path-specification-separator ;string
+                (default ":"))
+  (file-type    search-path-specification-file-type ;symbol
+                (default 'directory))
+  (file-pattern search-path-specification-file-pattern ;#f | string
+                (default #f)))
 
 (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 files separator type)
-     ;; TODO: Add support for PATTERN.
-     `(,variable ,files ,separator ,type #f))))
+    (($ <search-path-specification> variable files separator type pattern)
+     `(,variable ,files ,separator ,type ,pattern))))
 
 (define %supported-systems
   ;; This is the list of system types that are supported.  By default, we