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/linux.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/linux.scm')
| -rw-r--r-- | gnu/packages/linux.scm | 32 |
1 files changed, 16 insertions, 16 deletions
diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm index 5310d1bd9b1..73d1ce13d1e 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -2099,7 +2099,7 @@ dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3588-mnt-pocket-reform.dtb"))))))))))) (description (string-append (package-description base) " Configuration options and patches have been applied for use with MNT/Reform systems.")) (arguments - (substitute-keyword-arguments (package-arguments base) + (substitute-keyword-arguments arguments ((#:phases phases) #~(modify-phases #$phases (add-after 'unpack 'apply-reform-patches @@ -2434,7 +2434,7 @@ dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3588-mnt-pocket-reform.dtb"))))))))))) (description (string-append (package-description base) " Configuration options and patches have been applied for use with MNT/Reform systems.")) (arguments - (substitute-keyword-arguments (package-arguments base) + (substitute-keyword-arguments arguments ((#:phases phases) #~(modify-phases #$phases (add-after 'unpack 'apply-reform-patches @@ -4124,7 +4124,7 @@ module.") (package (inherit e2fsprogs) (arguments ;; Do not build shared libraries. - (substitute-keyword-arguments (package-arguments e2fsprogs) + (substitute-keyword-arguments arguments ((#:configure-flags _) '(list "--disable-blkid" "--disable-fuse2fs")) ((#:make-flags _) @@ -5368,7 +5368,7 @@ user-space processes.") (sha256 (base32 "11yfl2w2a445hllyzlakq97n32g06972vxpmh7lpbclnj9fhb5zp")))) (arguments - (substitute-keyword-arguments (package-arguments fuse) + (substitute-keyword-arguments arguments ((#:configure-flags original-flags #~(list)) #~(append #$original-flags '("--default-library=static"))))))) @@ -5430,7 +5430,7 @@ UnionFS-FUSE additionally supports copy-on-write.") (("mtab_needs_update[[:blank:]]*\\([a-z_]+\\)") "0") (("/bin/") "")))))) (arguments - (substitute-keyword-arguments (package-arguments fuse) + (substitute-keyword-arguments arguments ((#:configure-flags flags '()) #~(cons "-Ddefault_library=static" #$flags)))))) @@ -5451,7 +5451,7 @@ UnionFS-FUSE additionally supports copy-on-write.") (string-append "target_link_libraries" libs " dl)"))))))) (arguments - (substitute-keyword-arguments (package-arguments unionfs-fuse) + (substitute-keyword-arguments arguments ((#:configure-flags flags #~'()) #~(cons "-DCMAKE_EXE_LINKER_FLAGS=-static" #$flags)) ((#:phases phases #~%standard-phases) @@ -5663,7 +5663,7 @@ for systems using the Linux kernel. This includes commands such as (inherit kbd) (name "loadkeys-static") (arguments - (substitute-keyword-arguments (package-arguments kbd) + (substitute-keyword-arguments arguments ((#:configure-flags flags ''()) `(append '("LDFLAGS=-static" "--disable-shared" "--disable-nls" "--disable-vlock" ;so we don't need libpam @@ -6154,7 +6154,7 @@ mapper. Kernel components are part of Linux-libre.") ("udev:static" ,eudev "static"))) (arguments - (substitute-keyword-arguments (package-arguments lvm2) + (substitute-keyword-arguments arguments ((#:configure-flags flags '()) ;; LVM2 doesn't use Libtool, hence the custom option. `(append '("--enable-static_link") @@ -6573,7 +6573,7 @@ SMBus access.") (sha256 (base32 "0hd4c1w8lnwc3j95h3vpd125170l1d4myspyrlpamqx6wbr6jpnv")))) (arguments - (substitute-keyword-arguments (package-arguments i2c-tools) + (substitute-keyword-arguments arguments ((#:make-flags _) #~(list (string-append "prefix=" #$output) (string-append "CC=" #$(cc-for-target)))))))) @@ -7255,7 +7255,7 @@ arrays when needed.") (inherit mdadm) (name "mdadm-static") (arguments - (substitute-keyword-arguments (package-arguments mdadm) + (substitute-keyword-arguments arguments ((#:make-flags flags) #~(cons* "LDFLAGS = -static" "CXFLAGS = -DNO_LIBUDEV" @@ -8385,7 +8385,7 @@ The package provides additional NTFS tools.") (inherit ntfs-3g) (name "ntfs-3g-static") (arguments - (substitute-keyword-arguments (package-arguments ntfs-3g) + (substitute-keyword-arguments arguments ((#:configure-flags flags) `(append ,flags (list "--enable-really-static" @@ -10256,7 +10256,7 @@ available in the kernel Linux.") "Unprivileged chroot, bind mount, and binfmt_misc (statically linked)") (inputs `(("talloc" ,talloc/static))) (arguments - (substitute-keyword-arguments (package-arguments proot) + (substitute-keyword-arguments arguments ((#:make-flags flags) `(cons "LDFLAGS = -ltalloc -static -static-libgcc" ,flags)) ((#:phases phases) @@ -11101,7 +11101,7 @@ file systems.") (base32 "13xkn9jpmwp4fm9r68vhgznkmxhnv83n2b39mhy2qdaph90w2a1l")))) (arguments - (substitute-keyword-arguments (package-arguments xfsprogs) + (substitute-keyword-arguments arguments ((#:configure-flags configure-flags '()) `(cons "--enable-gettext=no" ,configure-flags)))) @@ -11115,7 +11115,7 @@ file systems.") (name "xfsprogs-static") (outputs (list "out")) (arguments - (substitute-keyword-arguments (package-arguments xfsprogs) + (substitute-keyword-arguments arguments ((#:configure-flags configure-flags '()) `(append ,configure-flags (list "--enable-static"))) @@ -11618,7 +11618,7 @@ tools for managing PipeWire.") (inherit base) (name "wireplumber-minimal") (arguments - (substitute-keyword-arguments (package-arguments base) + (substitute-keyword-arguments arguments ((#:configure-flags flags ''()) #~(cons "-Delogind=disabled" #$flags)))) (inputs @@ -12648,7 +12648,7 @@ work properly.") firejail (name "firejail-disable-sandbox-check") (arguments - (substitute-keyword-arguments (package-arguments firejail) + (substitute-keyword-arguments arguments ((#:configure-flags flags #~'()) #~(append #$flags (list "--disable-sandbox-check"))))) |
