diff options
| author | Mark H Weaver <mhw@netris.org> | 2017-06-26 00:00:58 -0400 |
|---|---|---|
| committer | Mark H Weaver <mhw@netris.org> | 2017-06-26 00:00:58 -0400 |
| commit | ed068b960eeedb92823238783779730319b8ba0e (patch) | |
| tree | 36a4de280458d52520b911b2716eb5cea309fd78 /guix/scripts/environment.scm | |
| parent | a9308efec642bfbce480545a22fce848e6212456 (diff) | |
| parent | ffc015bea26f24d862e7e877d907fbe1ab9a9967 (diff) | |
| download | guix-patches-ed068b960eeedb92823238783779730319b8ba0e.tar guix-patches-ed068b960eeedb92823238783779730319b8ba0e.tar.gz | |
Merge branch 'master' into core-updates
Diffstat (limited to 'guix/scripts/environment.scm')
| -rw-r--r-- | guix/scripts/environment.scm | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/guix/scripts/environment.scm b/guix/scripts/environment.scm index af69e2b730..0abc509a35 100644 --- a/guix/scripts/environment.scm +++ b/guix/scripts/environment.scm @@ -323,6 +323,13 @@ BOOTSTRAP? specifies whether to use the bootstrap Guile to build the profile." (profile-derivation (packages->manifest inputs) #:system system + + ;; Packages can have conflicting inputs, or explicit + ;; inputs that conflict with implicit inputs (e.g., gcc, + ;; gzip, etc.). Thus, do not error out when we + ;; encounter collision. + #:allow-collisions? #t + #:hooks (if bootstrap? '() %default-profile-hooks) |