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

buildDotnetPackage: fix nativeBuildInputs

Browse source 
the nativeBuildInputs of the derivation that uses buildDotnetPackage overshadowed the nativeBuildInputs of buildDotnetPackage
so pkg-config wasn't getting added to the path

dotnet-packages: remove unused arg
This commit is contained in:
Artturin 2021-11-11 21:35:43 +02:00
parent a8506b65b0
commit f77006c308
2 changed files with 5 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -3,6 +3,7 @@
attrsOrig @ attrsOrig @
{ baseName { baseName
, version , version
, nativeBuildInputs ? []
, buildInputs ? [] , buildInputs ? []
, xBuildFiles ? [ ] , xBuildFiles ? [ ]
, xBuildFlags ? [ "/p:Configuration=Release" ] , xBuildFlags ? [ "/p:Configuration=Release" ]
@ -19,7 +20,9 @@ attrsOrig @
attrs = { attrs = {
name = "${baseName}-${version}"; name = "${baseName}-${version}";
nativeBuildInputs = [ pkg-config ]; nativeBuildInputs = [
pkg-config
] ++ nativeBuildInputs;
buildInputs = [ buildInputs = [
mono mono
dotnetbuildhelpers dotnetbuildhelpers
@ -113,4 +116,4 @@ attrsOrig @
''; '';
}; };
in in
stdenv.mkDerivation (attrs // (builtins.removeAttrs attrsOrig [ "buildInputs" ] )) stdenv.mkDerivation (attrs // (builtins.removeAttrs attrsOrig [ "nativeBuildInputs" "buildInputs" ] ))

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 ? {}
}: }: