aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorVivien Kraus <vivien@planete-kraus.eu>2023-02-21 07:49:58 +0100
committerLudovic Courtès <ludo@gnu.org>2023-02-23 16:31:37 +0100
commit3809aa01a1287dbe5be90e7aa4407bf27a6467ed (patch)
treee0e50145f0a5837ead56c1f4ef83210d88d54769
parent84c9a94b451fb46eeef5d56ff58921ea0b8ce510 (diff)
downloadguix-3809aa01a1287dbe5be90e7aa4407bf27a6467ed.tar.gz
guix-3809aa01a1287dbe5be90e7aa4407bf27a6467ed.zip
gnu: gnulib: Allow only one directory name in GNULIB_SRCDIR.
* gnu/packages/build-tools.scm (gnulib-checkout) [search-path-specification GNULIB_SRCDIR]: Set separator to #f. Signed-off-by: Ludovic Courtès <ludo@gnu.org>
-rw-r--r--gnu/packages/build-tools.scm3
1 files changed, 2 insertions, 1 deletions
diff --git a/gnu/packages/build-tools.scm b/gnu/packages/build-tools.scm
index 3d03c37a2c..00b8f8caf3 100644
--- a/gnu/packages/build-tools.scm
+++ b/gnu/packages/build-tools.scm
@@ -997,7 +997,8 @@ maintenance-related files, for convenience.")
(native-search-paths
(list (search-path-specification
(variable "GNULIB_SRCDIR")
- (files (list "src/gnulib")))))
+ (files (list "src/gnulib"))
+ (separator #f))))
(license (list license:lgpl2.0+ license:gpl3+))))
(define-public gnulib
ner.sh?id=07ec349229eeae9f733fe92a300c7cfa4cf8e321'>environment: Add --link-profile....This change is motivated by attempts to run programs (like GNU IceCat) within containers. The 'fontconfig' program, for example, is configured explicitly to check ~/.guix-profile for additional fonts. There were no existing container tests in 'tests/guix-environment.sh', but I added one anyway for this change. * doc/guix.texi (Invoking guix environment): Add '--link-profile'. * guix/scripts/environment.scm (show-help): Add '--link-profile'. (%options): Add 'link-profile' as '#\P', assigned to 'link-profile?'. (link-environment): New procedure. (launch-environment/container): Use it when 'link-profile?'. [link-profile?]: New parameter. (guix-environment): Leave when '--link-prof' but not '--container'. Add '#:link-profile?' argument to 'launch-environment/container' application. * tests/guix-environment-container.sh: New '--link-profile' test. Signed-off-by: Ludovic Courtès <ludo@gnu.org> Mike Gerwitz