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/cpp.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/cpp.scm')
| -rw-r--r-- | gnu/packages/cpp.scm | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/gnu/packages/cpp.scm b/gnu/packages/cpp.scm index c2b31ecbb6c..cbccbf5fc5a 100644 --- a/gnu/packages/cpp.scm +++ b/gnu/packages/cpp.scm | |||
| @@ -2290,7 +2290,7 @@ Google's C++ code base.") | |||
| 2290 | (patches | 2290 | (patches |
| 2291 | (search-patches "abseil-cpp-20220623.1-no-kepsilon-i686.patch")))) | 2291 | (search-patches "abseil-cpp-20220623.1-no-kepsilon-i686.patch")))) |
| 2292 | (arguments | 2292 | (arguments |
| 2293 | (substitute-keyword-arguments (package-arguments base) | 2293 | (substitute-keyword-arguments arguments |
| 2294 | ((#:configure-flags flags #~'()) | 2294 | ((#:configure-flags flags #~'()) |
| 2295 | (if (target-riscv64?) | 2295 | (if (target-riscv64?) |
| 2296 | #~(cons* "-DCMAKE_SHARED_LINKER_FLAGS=-latomic" | 2296 | #~(cons* "-DCMAKE_SHARED_LINKER_FLAGS=-latomic" |
| @@ -2337,7 +2337,7 @@ Google's C++ code base.") | |||
| 2337 | (hidden-package | 2337 | (hidden-package |
| 2338 | (package/inherit base | 2338 | (package/inherit base |
| 2339 | (arguments | 2339 | (arguments |
| 2340 | (substitute-keyword-arguments (package-arguments base) | 2340 | (substitute-keyword-arguments arguments |
| 2341 | ((#:configure-flags flags) | 2341 | ((#:configure-flags flags) |
| 2342 | #~(cons* #$(string-append "-DCMAKE_CXX_STANDARD=" | 2342 | #~(cons* #$(string-append "-DCMAKE_CXX_STANDARD=" |
| 2343 | (number->string version)) | 2343 | (number->string version)) |
| @@ -2348,7 +2348,7 @@ Google's C++ code base.") | |||
| 2348 | (hidden-package | 2348 | (hidden-package |
| 2349 | (package/inherit base | 2349 | (package/inherit base |
| 2350 | (arguments | 2350 | (arguments |
| 2351 | (substitute-keyword-arguments (package-arguments base) | 2351 | (substitute-keyword-arguments arguments |
| 2352 | ((#:configure-flags flags) | 2352 | ((#:configure-flags flags) |
| 2353 | #~(cons* "-DCMAKE_POSITION_INDEPENDENT_CODE=ON" | 2353 | #~(cons* "-DCMAKE_POSITION_INDEPENDENT_CODE=ON" |
| 2354 | (delete "-DBUILD_SHARED_LIBS=ON" #$flags))))))))) | 2354 | (delete "-DBUILD_SHARED_LIBS=ON" #$flags))))))))) |
| @@ -3810,7 +3810,7 @@ parsing with only a single memory allocation.") | |||
| 3810 | "sajson-for-gemmi-numbers-as-strings.patch") | 3810 | "sajson-for-gemmi-numbers-as-strings.patch") |
| 3811 | (origin-patches (package-source sajson)))))) | 3811 | (origin-patches (package-source sajson)))))) |
| 3812 | (arguments | 3812 | (arguments |
| 3813 | (substitute-keyword-arguments (package-arguments sajson) | 3813 | (substitute-keyword-arguments arguments |
| 3814 | ;; This is a modified version used in gemmi, in which numbers are kept | 3814 | ;; This is a modified version used in gemmi, in which numbers are kept |
| 3815 | ;; as strings. Building the tests fails with the modification. | 3815 | ;; as strings. Building the tests fails with the modification. |
| 3816 | ((#:tests? _ #f) #f))) | 3816 | ((#:tests? _ #f) #f))) |
| @@ -4059,7 +4059,7 @@ common controls and win32-style extensions.") | |||
| 4059 | (inherit swell) | 4059 | (inherit swell) |
| 4060 | (name "swell-colortheme") | 4060 | (name "swell-colortheme") |
| 4061 | (arguments | 4061 | (arguments |
| 4062 | (substitute-keyword-arguments (package-arguments swell) | 4062 | (substitute-keyword-arguments arguments |
| 4063 | ((#:make-flags flags) | 4063 | ((#:make-flags flags) |
| 4064 | #~(append #$flags '("libSwell.colortheme"))) | 4064 | #~(append #$flags '("libSwell.colortheme"))) |
| 4065 | ((#:phases phases) | 4065 | ((#:phases phases) |
| @@ -4083,7 +4083,7 @@ programs that use @code{swell}."))) | |||
| 4083 | (inherit swell) | 4083 | (inherit swell) |
| 4084 | (name "jnetlib") | 4084 | (name "jnetlib") |
| 4085 | (arguments | 4085 | (arguments |
| 4086 | (substitute-keyword-arguments (package-arguments swell) | 4086 | (substitute-keyword-arguments arguments |
| 4087 | ((#:tests? _ #t) #t) | 4087 | ((#:tests? _ #t) #t) |
| 4088 | ((#:phases phases) | 4088 | ((#:phases phases) |
| 4089 | #~(modify-phases #$phases | 4089 | #~(modify-phases #$phases |
| @@ -4116,7 +4116,7 @@ features: | |||
| 4116 | (inherit swell) | 4116 | (inherit swell) |
| 4117 | (name "eel2") | 4117 | (name "eel2") |
| 4118 | (arguments | 4118 | (arguments |
| 4119 | (substitute-keyword-arguments (package-arguments swell) | 4119 | (substitute-keyword-arguments arguments |
| 4120 | ((#:tests? _ #t) #f) ;no tests | 4120 | ((#:tests? _ #t) #f) ;no tests |
| 4121 | ;; FIXME: Remove this flag when this issue will be fixed: | 4121 | ;; FIXME: Remove this flag when this issue will be fixed: |
| 4122 | ;; https://github.com/justinfrankel/WDL/issues/32. | 4122 | ;; https://github.com/justinfrankel/WDL/issues/32. |
| @@ -4675,7 +4675,7 @@ on @code{.po} files and doesn't need @code{.mo} files pre-generated.") | |||
| 4675 | (define-public tinygettext-with-sdl2 | 4675 | (define-public tinygettext-with-sdl2 |
| 4676 | (package/inherit tinygettext | 4676 | (package/inherit tinygettext |
| 4677 | (arguments | 4677 | (arguments |
| 4678 | (substitute-keyword-arguments (package-arguments tinygettext) | 4678 | (substitute-keyword-arguments arguments |
| 4679 | ((#:configure-flags flags) | 4679 | ((#:configure-flags flags) |
| 4680 | #~(list "-DTINYGETTEXT_WITH_SDL=ON" "-DBUILD_TESTS=ON")))) | 4680 | #~(list "-DTINYGETTEXT_WITH_SDL=ON" "-DBUILD_TESTS=ON")))) |
| 4681 | (native-inputs (list pkg-config tinycmmc)) | 4681 | (native-inputs (list pkg-config tinycmmc)) |
