diff options
| author | Marius Bakke <mbakke@fastmail.com> | 2020-03-30 12:17:33 +0200 |
|---|---|---|
| committer | Marius Bakke <mbakke@fastmail.com> | 2020-03-30 12:17:33 +0200 |
| commit | ae0badf5bb791428423a98d4e4e2b8d297a5d4be (patch) | |
| tree | 4282d243db3e90839a5f7d3b5878674ccd0e2e14 /guix/build-system | |
| parent | ee401ed9249fbe284ef1b9b437d39207ca88131b (diff) | |
| parent | 927f3655662b41f25225ea03baa3ded687aa7cbb (diff) | |
| download | guix-patches-ae0badf5bb791428423a98d4e4e2b8d297a5d4be.tar guix-patches-ae0badf5bb791428423a98d4e4e2b8d297a5d4be.tar.gz | |
Merge branch 'master' into core-updates
Conflicts:
gnu/packages/admin.scm
gnu/packages/commencement.scm
gnu/packages/guile.scm
gnu/packages/linux.scm
gnu/packages/package-management.scm
gnu/packages/pulseaudio.scm
gnu/packages/web.scm
Diffstat (limited to 'guix/build-system')
| -rw-r--r-- | guix/build-system/gnu.scm | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/guix/build-system/gnu.scm b/guix/build-system/gnu.scm index d6613edb33..f59567febb 100644 --- a/guix/build-system/gnu.scm +++ b/guix/build-system/gnu.scm @@ -151,8 +151,8 @@ so that they use INPUTS (a thunk) instead of implicit inputs." p)) (define (cut? p) - (and (eq? (package-build-system p) gnu-build-system) - (memq #:implicit-inputs? (package-arguments p)))) + (or (not (eq? (package-build-system p) gnu-build-system)) + (memq #:implicit-inputs? (package-arguments p)))) (package-mapping add-explicit-inputs cut?)) |