From 7b21fe538512b452c87389607f569668a7f1a1a4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= Date: Sat, 27 Dec 2014 23:15:11 +0100 Subject: [PATCH] packages: Add 'file-pattern' field to 'search-path-specification'. * guix/packages.scm ()[file-pattern]: New field. (search-path-specification->sexp): Honor it. --- guix/packages.scm | 17 ++++++++++------- 1 file 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 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 . The sexp corresponds to the arguments expected by `set-path-environment-variable'." (match spec - (($ variable files separator type) - ;; TODO: Add support for PATTERN. - `(,variable ,files ,separator ,type #f)))) + (($ 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