buildDotnetPackage: fix nativeBuildInputs
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:
parent
a8506b65b0
commit
f77006c308
2 changed files with 5 additions and 3 deletions
|
@ -3,6 +3,7 @@
|
|||
attrsOrig @
|
||||
{ baseName
|
||||
, version
|
||||
, nativeBuildInputs ? []
|
||||
, buildInputs ? []
|
||||
, xBuildFiles ? [ ]
|
||||
, xBuildFlags ? [ "/p:Configuration=Release" ]
|
||||
|
@ -19,7 +20,9 @@ attrsOrig @
|
|||
attrs = {
|
||||
name = "${baseName}-${version}";
|
||||
|
||||
nativeBuildInputs = [ pkg-config ];
|
||||
nativeBuildInputs = [
|
||||
pkg-config
|
||||
] ++ nativeBuildInputs;
|
||||
buildInputs = [
|
||||
mono
|
||||
dotnetbuildhelpers
|
||||
|
@ -113,4 +116,4 @@ attrsOrig @
|
|||
'';
|
||||
};
|
||||
in
|
||||
stdenv.mkDerivation (attrs // (builtins.removeAttrs attrsOrig [ "buildInputs" ] ))
|
||||
stdenv.mkDerivation (attrs // (builtins.removeAttrs attrsOrig [ "nativeBuildInputs" "buildInputs" ] ))
|
||||
|
|
|
@ -6,7 +6,6 @@
|
|||
, fetchFromGitHub
|
||||
, fetchNuGet
|
||||
, glib
|
||||
, pkg-config
|
||||
, mono
|
||||
, overrides ? {}
|
||||
}:
|
||||
|
|
Loading…
Reference in a new issue