diff options
| author | Efraim Flashner <efraim@flashner.co.il> | 2023-01-30 11:33:18 +0200 |
|---|---|---|
| committer | Efraim Flashner <efraim@flashner.co.il> | 2023-01-30 12:39:40 +0200 |
| commit | 4cf1acc7f3033b50b0bf19e02c9f522d522d338c (patch) | |
| tree | 9fd64956ee60304c15387eb394cd649e49f01467 /gnu/packages/commencement.scm | |
| parent | edb8c09addd186d9538d43b12af74d6c7aeea082 (diff) | |
| parent | 595b53b74e3ef57a1c0c96108ba86d38a170a241 (diff) | |
Merge remote-tracking branch 'origin/master' into core-updates
Conflicts:
doc/guix.texi
gnu/local.mk
gnu/packages/admin.scm
gnu/packages/base.scm
gnu/packages/chromium.scm
gnu/packages/compression.scm
gnu/packages/databases.scm
gnu/packages/diffoscope.scm
gnu/packages/freedesktop.scm
gnu/packages/gnome.scm
gnu/packages/gnupg.scm
gnu/packages/guile.scm
gnu/packages/inkscape.scm
gnu/packages/llvm.scm
gnu/packages/openldap.scm
gnu/packages/pciutils.scm
gnu/packages/ruby.scm
gnu/packages/samba.scm
gnu/packages/sqlite.scm
gnu/packages/statistics.scm
gnu/packages/syndication.scm
gnu/packages/tex.scm
gnu/packages/tls.scm
gnu/packages/version-control.scm
gnu/packages/xml.scm
guix/build-system/copy.scm
guix/scripts/home.scm
Diffstat (limited to 'gnu/packages/commencement.scm')
| -rw-r--r-- | gnu/packages/commencement.scm | 16 |
1 files changed, 9 insertions, 7 deletions
diff --git a/gnu/packages/commencement.scm b/gnu/packages/commencement.scm index 1362cd99ca..149d34b24c 100644 --- a/gnu/packages/commencement.scm +++ b/gnu/packages/commencement.scm @@ -1996,15 +1996,15 @@ exec " gcc "/bin/" program `(#:tests? #f ; the test suite needs diffutils #:guile ,%bootstrap-guile #:implicit-inputs? #f - ,@(match (%current-system) - ((or "arm-linux" "aarch64-linux") - (substitute-keyword-arguments (package-arguments diffutils) - ((#:configure-flags flags ''()) + ,@(substitute-keyword-arguments (package-arguments diffutils) + ((#:configure-flags flags ''()) + (match (%current-system) + ((or "arm-linux" "aarch64-linux") ;; The generated config.status has some problems due to the ;; bootstrap environment. Disable dependency tracking to work ;; around it. - `(cons "--disable-dependency-tracking" ,flags)))) - (_ '())))))) + `(cons "--disable-dependency-tracking" ,flags)) + (_ flags)))))))) (define findutils-boot0 (package @@ -2047,7 +2047,9 @@ exec " gcc "/bin/" program (substitute* "gnulib-tests/Makefile" (("^XFAIL_TESTS =") "XFAIL_TESTS = test-fnmatch "))))) - '())))))))) + '()))) + ((#:make-flags flags ''()) + ''())))))) (define file (package |