cafkafk/nixpkgs
cafkafk/nixpkgs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 2

Merge pull request #145533 from Artturin/builddotnetpkgconfig

Browse source
This commit is contained in:
Artturi 2021-11-13 01:27:33 +02:00 committed by GitHub
commit 69bdaa04d8
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 8 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

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

1
pkgs/top-level/dotnet-packages.nix
View file

@ -6,7 +6,6 @@
, fetchFromGitHub , fetchFromGitHub
, fetchNuGet , fetchNuGet
, glib , glib
, pkg-config
, mono , mono
, overrides ? {} , overrides ? {}
}: }: