diff --git a/pkgs/build-support/build-dotnet-package/default.nix b/pkgs/build-support/build-dotnet-package/default.nix index 440b10044f0f..16dfd694ed3d 100644 --- a/pkgs/build-support/build-dotnet-package/default.nix +++ b/pkgs/build-support/build-dotnet-package/default.nix @@ -3,7 +3,7 @@ attrsOrig @ { baseName , version -, buildInputs ? [] +, nativeBuildInputs ? [] , xBuildFiles ? [ ] , xBuildFlags ? [ "/p:Configuration=Release" ] , outputFiles ? [ "bin/Release/*" ] @@ -19,12 +19,12 @@ attrsOrig @ attrs = { name = "${baseName}-${version}"; - nativeBuildInputs = [ pkg-config ]; - buildInputs = [ - mono - dotnetbuildhelpers + nativeBuildInputs = [ + pkg-config makeWrapper - ] ++ buildInputs; + dotnetbuildhelpers + mono + ] ++ nativeBuildInputs; configurePhase = '' runHook preConfigure @@ -87,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 @@ -113,4 +113,4 @@ attrsOrig @ ''; }; in - stdenv.mkDerivation (attrs // (builtins.removeAttrs attrsOrig [ "buildInputs" ] )) + stdenv.mkDerivation (attrs // (builtins.removeAttrs attrsOrig [ "nativeBuildInputs" ] )) diff --git a/pkgs/top-level/dotnet-packages.nix b/pkgs/top-level/dotnet-packages.nix index 1ca8621b7114..f0fcef733837 100644 --- a/pkgs/top-level/dotnet-packages.nix +++ b/pkgs/top-level/dotnet-packages.nix @@ -6,7 +6,6 @@ , fetchFromGitHub , fetchNuGet , glib -, pkg-config , mono , overrides ? {} }: