summaryrefslogtreecommitdiff
path: root/gnu/packages/cpp.scm
diff options
context:
space:
mode:
authorLudovic Courtès <ludo@gnu.org>2026-03-07 11:19:10 +0100
committerLudovic Courtès <ludo@gnu.org>2026-03-20 13:27:15 +0100
commit2a50c9598bb7fe4175c4f29df07656a7f0a07801 (patch)
tree90e02e712b28397979c06d3fe1cf9ca6be201871 /gnu/packages/cpp.scm
parenta7c8e68dc51144a6d3981b770aca9c4897fc7c0c (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.scm16
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.")
(patches
(search-patches "abseil-cpp-20220623.1-no-kepsilon-i686.patch"))))
(arguments
- (substitute-keyword-arguments (package-arguments base)
+ (substitute-keyword-arguments arguments
((#:configure-flags flags #~'())
(if (target-riscv64?)
#~(cons* "-DCMAKE_SHARED_LINKER_FLAGS=-latomic"
@@ -2337,7 +2337,7 @@ Google's C++ code base.")
(hidden-package
(package/inherit base
(arguments
- (substitute-keyword-arguments (package-arguments base)
+ (substitute-keyword-arguments arguments
((#:configure-flags flags)
#~(cons* #$(string-append "-DCMAKE_CXX_STANDARD="
(number->string version))
@@ -2348,7 +2348,7 @@ Google's C++ code base.")
(hidden-package
(package/inherit base
(arguments
- (substitute-keyword-arguments (package-arguments base)
+ (substitute-keyword-arguments arguments
((#:configure-flags flags)
#~(cons* "-DCMAKE_POSITION_INDEPENDENT_CODE=ON"
(delete "-DBUILD_SHARED_LIBS=ON" #$flags)))))))))
@@ -3810,7 +3810,7 @@ parsing with only a single memory allocation.")
"sajson-for-gemmi-numbers-as-strings.patch")
(origin-patches (package-source sajson))))))
(arguments
- (substitute-keyword-arguments (package-arguments sajson)
+ (substitute-keyword-arguments arguments
;; This is a modified version used in gemmi, in which numbers are kept
;; as strings. Building the tests fails with the modification.
((#:tests? _ #f) #f)))
@@ -4059,7 +4059,7 @@ common controls and win32-style extensions.")
(inherit swell)
(name "swell-colortheme")
(arguments
- (substitute-keyword-arguments (package-arguments swell)
+ (substitute-keyword-arguments arguments
((#:make-flags flags)
#~(append #$flags '("libSwell.colortheme")))
((#:phases phases)
@@ -4083,7 +4083,7 @@ programs that use @code{swell}.")))
(inherit swell)
(name "jnetlib")
(arguments
- (substitute-keyword-arguments (package-arguments swell)
+ (substitute-keyword-arguments arguments
((#:tests? _ #t) #t)
((#:phases phases)
#~(modify-phases #$phases
@@ -4116,7 +4116,7 @@ features:
(inherit swell)
(name "eel2")
(arguments
- (substitute-keyword-arguments (package-arguments swell)
+ (substitute-keyword-arguments arguments
((#:tests? _ #t) #f) ;no tests
;; FIXME: Remove this flag when this issue will be fixed:
;; https://github.com/justinfrankel/WDL/issues/32.
@@ -4675,7 +4675,7 @@ on @code{.po} files and doesn't need @code{.mo} files pre-generated.")
(define-public tinygettext-with-sdl2
(package/inherit tinygettext
(arguments
- (substitute-keyword-arguments (package-arguments tinygettext)
+ (substitute-keyword-arguments arguments
((#:configure-flags flags)
#~(list "-DTINYGETTEXT_WITH_SDL=ON" "-DBUILD_TESTS=ON"))))
(native-inputs (list pkg-config tinycmmc))