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

treewide: handle preConfigurePhases __structuredAttrs-agnostically

Browse Source 
Always specify the preConfigurePhases attribute as a list instead of a
string.

Append elements to the preConfigurePhases Bash variable using
appendToVar instead of string or Bash array concatenation.
This commit is contained in:
Yueh-Shun Li 2024-09-03 04:14:28 +08:00
parent 21c0129841
commit 5d42a8b38c
7 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pkgs/build-support/coq/default.nix
View File

@ -146,7 +146,7 @@ stdenv.mkDerivation (removeAttrs ({
})
// (optionalAttrs (args?useMelquiondRemake) rec {
COQUSERCONTRIB = "$out/lib/coq/${coq.coq-version}/user-contrib";
preConfigurePhases = "autoconf";
preConfigurePhases = [ "autoconf" ];
configureFlags = [ "--libdir=${COQUSERCONTRIB}/${useMelquiondRemake.logpath or ""}" ];
buildPhase = "./remake -j$NIX_BUILD_CORES";
installPhase = "./remake install";

2
pkgs/build-support/release/source-tarball.nix
View File

@ -31,7 +31,7 @@ stdenv.mkDerivation (
showBuildStats = true;
preConfigurePhases = "autoconfPhase";
preConfigurePhases = [ "autoconfPhase" ];
postPhases = "finalPhase";
# Autoconfiscate the sources.

2
pkgs/build-support/setup-hooks/autoreconf.sh
View File

@ -1,4 +1,4 @@
preConfigurePhases="${preConfigurePhases:-} autoreconfPhase"
appendToVar preConfigurePhases autoreconfPhase
autoreconfPhase() {
runHook preAutoreconf

2
pkgs/build-support/setup-hooks/update-autotools-gnu-config-scripts.sh
View File

@ -1,4 +1,4 @@
preConfigurePhases+=" updateAutotoolsGnuConfigScriptsPhase"
appendToVar preConfigurePhases updateAutotoolsGnuConfigScriptsPhase
updateAutotoolsGnuConfigScriptsPhase() {
if [ -n "${dontUpdateAutotoolsGnuConfigScripts-}" ]; then return; fi

2
pkgs/desktops/xfce/core/xfce4-dev-tools/setup-hook.sh
View File

@ -10,5 +10,5 @@ xdtAutogenPhase() {
}
if [ -z "${dontUseXdtAutogenPhase-}" ]; then
preConfigurePhases+=(xdtAutogenPhase)
appendToVar preConfigurePhases xdtAutogenPhase
fi

2
pkgs/development/compilers/dotnet/dotnet-sdk-setup-hook.sh
View File

@ -74,5 +74,5 @@ configureNuget() {
if [[ -z ${dontConfigureNuget-} ]]; then
appendToVar prePhases createNugetDirs
preConfigurePhases+=(configureNuget)
appendToVar preConfigurePhases configureNuget
fi

2
pkgs/development/libraries/liquidfun/default.nix
View File

@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
sourceRoot = "liquidfun/Box2D";
preConfigurePhases = "preConfigure";
preConfigurePhases = [ "preConfigure" ];
preConfigure = ''
sed -i Box2D/Common/b2Settings.h -e 's@b2_maxPolygonVertices .*@b2_maxPolygonVertices 15@'