summaryrefslogtreecommitdiff
path: root/guix/profiles.scm
diff options
context:
space:
mode:
authorLudovic Courtès <ludo@gnu.org>2015-03-04 17:04:35 +0100
committerLudovic Courtès <ludo@gnu.org>2015-03-04 17:23:27 +0100
commit6d0b9d03ced244093c026b3433ec06643d78236c (patch)
treefeda4f852f446f47307285db5305917c3a752980 /guix/profiles.scm
parent0e309f1e5bc78dfc1366f40e4071b2fd0979178f (diff)
tests: Remove dependency on 'glibc-utf8-locales' for profile tests.
This fixes a regression introduced in commit 536c3ee. * guix/profiles.scm (ca-certificate-bundle): When MANIFEST is empty, make a trivial derivation. * guix/scripts/package.scm (guix-package)[process-actions]: Pass #:ca-certificate-bundle? to 'profile-generation'. * tests/packages.scm ("--search-paths with pattern"): Likewise. * tests/profiles.scm ("profile-derivation"): Likewise.
Diffstat (limited to 'guix/profiles.scm')
-rw-r--r--guix/profiles.scm10
1 files changed, 7 insertions, 3 deletions
diff --git a/guix/profiles.scm b/guix/profiles.scm
index 5ceba25def..d62674923f 100644
--- a/guix/profiles.scm
+++ b/guix/profiles.scm
@@ -464,9 +464,13 @@ MANIFEST. Single-file bundles are required by programs such as Git and Lynx."
(string-append result
"/ca-certificates.crt")))))
- (gexp->derivation "ca-certificate-bundle" build
- #:modules '((guix build utils))
- #:local-build? #t))
+ ;; Don't depend on 'glibc-utf8-locales' and its dependencies when there's
+ ;; nothing to do.
+ (if (null? (manifest-entries manifest))
+ (gexp->derivation "ca-certificate-bundle" #~(mkdir #$output))
+ (gexp->derivation "ca-certificate-bundle" build
+ #:modules '((guix build utils))
+ #:local-build? #t)))
(define* (profile-derivation manifest
#:key