b12f/nixpkgs
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

buildDotnetPackage: move buildInputs to nativeBuildInputs

Browse source 
they're run during the build so they belong there
This commit is contained in:
Artturin 2021-11-11 22:23:40 +02:00
parent f77006c308
commit ffb9a309b6
1 changed files with 5 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
pkgs/build-support/build-dotnet-package/default.nix
View file

@ -4,7 +4,6 @@ attrsOrig @
{ baseName
, version
, nativeBuildInputs ? []
, buildInputs ? []
, xBuildFiles ? [ ]
, xBuildFlags ? [ "/p:Configuration=Release" ]
, outputFiles ? [ "bin/Release/*" ]
@ -22,12 +21,10 @@ attrsOrig @
nativeBuildInputs = [
pkg-config
] ++ nativeBuildInputs;
buildInputs = [
mono
dotnetbuildhelpers
makeWrapper
] ++ buildInputs;
dotnetbuildhelpers
mono
] ++ nativeBuildInputs;
configurePhase = ''
runHook preConfigure
@ -90,7 +87,7 @@ attrsOrig @
then
echo "$dll already exported by a buildInputs, not re-exporting"
else
${dotnetbuildhelpers}/bin/create-pkg-config-for-dll.sh "$out/lib/pkgconfig" "$dll"
create-pkg-config-for-dll.sh "$out/lib/pkgconfig" "$dll"
fi
done
done
@ -116,4 +113,4 @@ attrsOrig @
'';
};
in
stdenv.mkDerivation (attrs // (builtins.removeAttrs attrsOrig [ "nativeBuildInputs" "buildInputs" ] ))
stdenv.mkDerivation (attrs // (builtins.removeAttrs attrsOrig [ "nativeBuildInputs" ] ))