qbit/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

treewide: replace xxxFlagsArray with non-Array variant in nix code

Browse Source 
The xxxFlagsArray variants were never meant to be used in nix code, at
least they can't be used properly without __structuredAttrs turned on.

If no spaces are passed in the argument the xxxFlagsArray can be
replaced as-is with the non-Array variant. When whitespace needs to be
passed, the derivation is additionally changed to enable
__structuredAttrs.
This commit is contained in:
Wolfgang Walther 2024-08-18 12:52:34 +02:00
parent e325795397
commit e3244e9ff0
No known key found for this signature in database
GPG Key ID: B39893FA5F65CAE1
20 changed files with 35 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
pkgs/applications/graphics/oculante/default.nix
View File

@ -41,8 +41,6 @@ rustPlatform.buildRustPackage rec {
wrapGAppsHook3
];
checkFlagsArray = [ "--skip=tests::net" ]; # requires network access
buildInputs = [
openssl
fontconfig
@ -62,6 +60,7 @@ rustPlatform.buildRustPackage rec {
checkFlags = [
"--skip=bench"
"--skip=tests::net" # requires network access
];
postInstall = ''

2
pkgs/applications/networking/instant-messengers/element/keytar/default.nix
View File

@ -37,7 +37,7 @@ in stdenv.mkDerivation rec {
'';
# https://nodejs.org/api/os.html#osarch
npmFlagsArray = [ "--arch=${if stdenv.hostPlatform.parsed.cpu.name == "i686" then "ia32"
npmFlags = [ "--arch=${if stdenv.hostPlatform.parsed.cpu.name == "i686" then "ia32"
else if stdenv.hostPlatform.parsed.cpu.name == "x86_64" then "x64"
else if stdenv.hostPlatform.parsed.cpu.name == "aarch64" then "arm64"
else stdenv.hostPlatform.parsed.cpu.name}" ];

2
pkgs/applications/video/uvccapture/default.nix
View File

@ -30,7 +30,7 @@ stdenv.mkDerivation rec {
done
'';
makeFlagsArray = [ "PREFIX=$(out)/bin/" ];
makeFlags = [ "PREFIX=$(out)/bin/" ];
preInstall = ''
mkdir -p "$out/bin"

12
pkgs/by-name/ne/neovim-unwrapped/package.nix
View File

@ -149,7 +149,7 @@ in {
# check that the above patching actually works
disallowedRequisites = [ stdenv.cc ] ++ lib.optional (lua != codegenLua) codegenLua;
cmakeFlagsArray = [
cmakeFlags = [
# Don't use downloaded dependencies. At the end of the configurePhase one
# can spot that cmake says this option was "not used by the project".
# That's because all dependencies were found and
@ -157,15 +157,13 @@ in {
"-DUSE_BUNDLED=OFF"
]
++ lib.optional (!lua.pkgs.isLuaJIT) "-DPREFER_LUA=ON"
;
preConfigure = lib.optionalString lua.pkgs.isLuaJIT ''
cmakeFlagsArray+=(
++ lib.optionals lua.pkgs.isLuaJIT [
"-DLUAC_PRG=${codegenLua}/bin/luajit -b -s %s -"
"-DLUA_GEN_PRG=${codegenLua}/bin/luajit"
"-DLUA_PRG=${neovimLuaEnvOnBuild}/bin/luajit"
)
'' + lib.optionalString stdenv.isDarwin ''
];
preConfigure = lib.optionalString stdenv.isDarwin ''
substituteInPlace src/nvim/CMakeLists.txt --replace " util" ""
'' + ''
mkdir -p $out/lib/nvim/parser

2
pkgs/by-name/xm/xmoji/package.nix
View File

@ -50,7 +50,7 @@ stdenv.mkDerivation (finalAttrs: {
xcbutilimage
];
makeFlagsArray = [ "prefix=${placeholder "out"}" ];
makeFlags = [ "prefix=${placeholder "out"}" ];
meta = {
description = "Plain X11 emoji keyboard";

2
pkgs/by-name/xr/xr-hardware/package.nix
View File

@ -19,7 +19,7 @@ stdenvNoCC.mkDerivation (finalAttrs: {
dontBuild = true;
installTargets = "install_package";
installFlagsArray = "DESTDIR=${placeholder "out"}";
installFlags = "DESTDIR=${placeholder "out"}";
passthru.updateScript = nix-update-script { };

2
pkgs/development/cuda-modules/nccl/default.nix
View File

@ -69,7 +69,7 @@ backendStdenv.mkDerivation (finalAttrs: {
patchShebangs ./src/device/generate.py
'';
makeFlagsArray =
makeFlags =
[
"PREFIX=$(out)"
"NVCC_GENCODE=${cudaFlags.gencodeString}"

2
pkgs/development/cuda-modules/saxpy/default.nix
View File

@ -53,7 +53,7 @@ backendStdenv.mkDerivation {
]
++ lib.optionals (cudaAtLeast "12.0") [ cuda_cccl ];
cmakeFlagsArray = [
cmakeFlags = [
(lib.cmakeBool "CMAKE_VERBOSE_MAKEFILE" true)
(lib.cmakeFeature "CMAKE_CUDA_ARCHITECTURES" flags.cmakeCudaArchitecturesString)
];

2
pkgs/development/libraries/appindicator-sharp/default.nix
View File

@ -32,7 +32,7 @@ stdenv.mkDerivation rec {
];
ac_cv_path_MDOC = "no";
installFlagsArray = ["GAPIXMLDIR=/tmp/gapixml"];
installFlags = ["GAPIXMLDIR=/tmp/gapixml"];
meta = {
description = "Bindings for appindicator using gobject-introspection";

4
pkgs/development/libraries/science/math/bonmin/default.nix
View File

@ -31,6 +31,8 @@ stdenv.mkDerivation rec {
sha256 = "sha256-nqjAQ1NdNJ/T4p8YljEWRt/uy2aDwyBeAsag0TmRc5Q=";
};
__structuredAttrs = true;
nativeBuildInputs = [
doxygen
gfortran
@ -50,7 +52,7 @@ stdenv.mkDerivation rec {
zlib
];
configureFlagsArray = lib.optionals stdenv.isDarwin [
configureFlags = lib.optionals stdenv.isDarwin [
"--with-asl-lib=-lipoptamplinterface -lamplsolver"
];

4
pkgs/development/libraries/science/math/scalapack/default.nix
View File

@ -17,6 +17,8 @@ stdenv.mkDerivation rec {
passthru = { inherit (blas) isILP64; };
__structuredAttrs = true;
# upstream patch, remove with next release
patches = [ (fetchpatch {
name = "gcc-10";
@ -62,7 +64,7 @@ stdenv.mkDerivation rec {
# Increase individual test timeout from 1500s to 10000s because hydra's builds
# sometimes fail due to this
checkFlagsArray = [ "ARGS=--timeout 10000" ];
checkFlags = [ "ARGS=--timeout 10000" ];
postFixup = ''
# _IMPORT_PREFIX, used to point to lib, points to dev output. Every package using the generated

2
pkgs/development/libraries/webkit2-sharp/default.nix
View File

@ -42,7 +42,7 @@ stdenv.mkDerivation rec {
'';
ac_cv_path_MONODOCER = "no";
installFlagsArray = ["GAPIXMLDIR=/tmp/gapixml"];
installFlags = ["GAPIXMLDIR=/tmp/gapixml"];
passthru = {
inherit webkitgtk;

2
pkgs/development/tools/build-managers/fac/default.nix
View File

@ -17,7 +17,7 @@ rustPlatform.buildRustPackage rec {
# fac includes a unit test called ls_files_works which assumes it's
# running in a git repo. Nix's sandbox runs cargo build outside git,
# so this test won't work.
checkFlagsArray = [ "--skip=ls_files_works" ];
checkFlags = [ "--skip=ls_files_works" ];
# fac calls git at runtime, expecting it to be in the PATH,
# so we need to patch it to call git by absolute path instead.

2
pkgs/development/tools/rust/cargo-cache/default.nix
View File

@ -15,7 +15,7 @@ rustPlatform.buildRustPackage rec {
buildInputs = lib.optionals stdenv.isDarwin [ libiconv Security ];
checkFlagsArray = [ "offline_tests" ];
checkFlags = [ "offline_tests" ];
meta = with lib; {
description = "Manage cargo cache (\${CARGO_HOME}, ~/.cargo/), print sizes of dirs and remove dirs selectively";

4
pkgs/games/warmux/default.nix
View File

@ -15,8 +15,10 @@ stdenv.mkDerivation {
sha256 = "1hvzglsmp75xiqqb0k75qjz4jwi8kl3fhn8zfsz53hhhqmbw6wkr";
};
__structuredAttrs = true;
preConfigure = "patchShebangs autogen.sh && ./autogen.sh";
configureFlagsArray = ("CFLAGS=-include ${zlib.dev}/include/zlib.h");
configureFlags = ["CFLAGS=-include ${zlib.dev}/include/zlib.h"];
nativeBuildInputs = [
autoconf automake gettext intltool libtool pkg-config

2
pkgs/servers/janus-gateway/default.nix
View File

@ -42,7 +42,7 @@ stdenv.mkDerivation rec {
"--enable-post-processing"
];
makeFlagsArray = [
makeFlags = [
"BORINGSSL_LIBS=-L${lib.getLib boringssl}/lib"
];

2
pkgs/tools/backup/monolith/default.nix
View File

@ -25,7 +25,7 @@ rustPlatform.buildRustPackage rec {
buildInputs = lib.optionals stdenv.isLinux [ openssl ]
++ lib.optionals stdenv.isDarwin [ libiconv Security SystemConfiguration ];
checkFlagsArray = [ "--skip=tests::cli" ];
checkFlags = [ "--skip=tests::cli" ];
meta = with lib; {
description = "Bundle any web page into a single HTML file";

2
pkgs/tools/cd-dvd/sacd/default.nix
View File

@ -25,7 +25,7 @@ stdenv.mkDerivation (finalAttrs: {
})
];
makeFlagsArray = [
makeFlags = [
"PREFIX=$(out)"
];

2
pkgs/tools/misc/intermodal/default.nix
View File

@ -14,7 +14,7 @@ rustPlatform.buildRustPackage rec {
cargoHash = "sha256-7vtUMG6mxAHKnbouyTsaUf1myJssxYoqAIOjc6m86Fo=";
# include_hidden test tries to use `chflags` on darwin
checkFlagsArray = lib.optionals stdenv.isDarwin [ "--skip=subcommand::torrent::create::tests::include_hidden" ];
checkFlags = lib.optionals stdenv.isDarwin [ "--skip=subcommand::torrent::create::tests::include_hidden" ];
nativeBuildInputs = [ installShellFiles ];

5
pkgs/tools/security/sudo/default.nix
View File

@ -39,6 +39,7 @@ stdenv.mkDerivation (finalAttrs: {
"--with-iologdir=/var/log/sudo-io"
"--with-sendmail=${sendmailPath}"
"--enable-tmpfiles.d=no"
"--with-passprompt=[sudo] password for %p: " # intentional trailing space
] ++ lib.optionals withInsults [
"--with-insults"
"--with-all-insults"
@ -47,10 +48,6 @@ stdenv.mkDerivation (finalAttrs: {
"--with-sssd-lib=${sssd}/lib"
];
configureFlagsArray = [
"--with-passprompt=[sudo] password for %p: " # intentional trailing space
];
postConfigure =
''
cat >> pathnames.h <<'EOF'