diff options
| author | Ludovic Courtès <ludo@gnu.org> | 2026-03-07 11:19:10 +0100 |
|---|---|---|
| committer | Ludovic Courtès <ludo@gnu.org> | 2026-03-20 13:27:15 +0100 |
| commit | 2a50c9598bb7fe4175c4f29df07656a7f0a07801 (patch) | |
| tree | 90e02e712b28397979c06d3fe1cf9ca6be201871 /gnu/packages/cross-base.scm | |
| parent | a7c8e68dc51144a6d3981b770aca9c4897fc7c0c (diff) | |
gnu: Reference the inherited ‘arguments’ value.
This commit was made by running this command:
sed -e's/substitute-keyword-arguments (package-arguments [a-zA-Z0-9-]\+)/substitute-keyword-arguments arguments/g' -i gnu/packages/*.scm
… and then:
1. reverting changes from ‘gnu/packages/rust.scm’ and
‘gnu/packages/java.scm’ since they would incur derivation changes and/or
breakage;
2. reverting the change for ‘gcc-final’ in ‘gnu/packages/commencement.scm’;
3. reverting the change for ‘onnx-optimizer’, ‘openquest’, and ‘certbot’,
which use ‘substitute-keyword-arguments’ for arguments that are not
inherited (and thus ‘arguments’ would be unbound);
4. reverting the change for ‘insight-toolkit-legacy’ and ‘wine64-staging’
which make bogus assumptions about inherited arguments.
Change-Id: I122a7cf517b6b63cae38944b5d33ade4b1f5a89c
Diffstat (limited to 'gnu/packages/cross-base.scm')
| -rw-r--r-- | gnu/packages/cross-base.scm | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/gnu/packages/cross-base.scm b/gnu/packages/cross-base.scm index cbabc0517e3..a550e0c47b1 100644 --- a/gnu/packages/cross-base.scm +++ b/gnu/packages/cross-base.scm | |||
| @@ -79,7 +79,7 @@ | |||
| 79 | (package (inherit p) | 79 | (package (inherit p) |
| 80 | (name (string-append (package-name p) "-cross-" target)) | 80 | (name (string-append (package-name p) "-cross-" target)) |
| 81 | (arguments | 81 | (arguments |
| 82 | (substitute-keyword-arguments (package-arguments p) | 82 | (substitute-keyword-arguments arguments |
| 83 | ((#:configure-flags flags #~'()) | 83 | ((#:configure-flags flags #~'()) |
| 84 | #~(cons #$(string-append "--target=" target) | 84 | #~(cons #$(string-append "--target=" target) |
| 85 | #$flags)))))) | 85 | #$flags)))))) |
| @@ -438,7 +438,7 @@ target that libc." | |||
| 438 | (name (string-append (package-name gnumach-headers) | 438 | (name (string-append (package-name gnumach-headers) |
| 439 | "-cross-" target)) | 439 | "-cross-" target)) |
| 440 | (arguments | 440 | (arguments |
| 441 | (substitute-keyword-arguments (package-arguments gnumach-headers) | 441 | (substitute-keyword-arguments arguments |
| 442 | ((#:phases phases #~%standard-phases) | 442 | ((#:phases phases #~%standard-phases) |
| 443 | #~(modify-phases #$phases | 443 | #~(modify-phases #$phases |
| 444 | ;; Cheat by setting the host_cpu variable manually, since using | 444 | ;; Cheat by setting the host_cpu variable manually, since using |
| @@ -474,7 +474,7 @@ the base compiler. Use XBINUTILS as the associated cross-Binutils." | |||
| 474 | (inherit mig) | 474 | (inherit mig) |
| 475 | (name (string-append "mig-cross")) | 475 | (name (string-append "mig-cross")) |
| 476 | (arguments | 476 | (arguments |
| 477 | (substitute-keyword-arguments (package-arguments mig) | 477 | (substitute-keyword-arguments arguments |
| 478 | ((#:configure-flags flags #~'()) | 478 | ((#:configure-flags flags #~'()) |
| 479 | #~(list #$(string-append "--target=" target))) | 479 | #~(list #$(string-append "--target=" target))) |
| 480 | ((#:tests? _ #f) | 480 | ((#:tests? _ #f) |
| @@ -543,7 +543,7 @@ the base compiler. Use XBINUTILS as the associated cross-Binutils." | |||
| 543 | "-cross-" target)) | 543 | "-cross-" target)) |
| 544 | 544 | ||
| 545 | (arguments | 545 | (arguments |
| 546 | (substitute-keyword-arguments (package-arguments hurd-headers) | 546 | (substitute-keyword-arguments arguments |
| 547 | ((#:configure-flags flags) | 547 | ((#:configure-flags flags) |
| 548 | `(cons* ,(string-append "--build=" (%current-system)) | 548 | `(cons* ,(string-append "--build=" (%current-system)) |
| 549 | ,(string-append "--host=" target) | 549 | ,(string-append "--host=" target) |
