diff options
| author | Artturin <Artturin@artturin.com> | 2021-11-11 21:35:43 +0200 |
|---|---|---|
| committer | Artturin <Artturin@artturin.com> | 2021-11-11 21:47:50 +0200 |
| commit | f77006c308e4a86d8dadfe7cb4441e6d55623370 (patch) | |
| tree | 312a0ff2f5060f52cd0d28e67f579a636ffbcd1d | |
| parent | a8506b65b03ab7b8331855849b6ac509cbe2cb0c (diff) | |
| download | nixpkgs-f77006c308e4a86d8dadfe7cb4441e6d55623370.tar nixpkgs-f77006c308e4a86d8dadfe7cb4441e6d55623370.tar.gz nixpkgs-f77006c308e4a86d8dadfe7cb4441e6d55623370.tar.bz2 nixpkgs-f77006c308e4a86d8dadfe7cb4441e6d55623370.tar.lz nixpkgs-f77006c308e4a86d8dadfe7cb4441e6d55623370.tar.xz nixpkgs-f77006c308e4a86d8dadfe7cb4441e6d55623370.tar.zst nixpkgs-f77006c308e4a86d8dadfe7cb4441e6d55623370.zip | |
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
| -rw-r--r-- | pkgs/build-support/build-dotnet-package/default.nix | 7 | ||||
| -rw-r--r-- | pkgs/top-level/dotnet-packages.nix | 1 |
2 files changed, 5 insertions, 3 deletions
diff --git a/pkgs/build-support/build-dotnet-package/default.nix b/pkgs/build-support/build-dotnet-package/default.nix index 440b10044f0..c174b639959 100644 --- a/pkgs/build-support/build-dotnet-package/default.nix +++ b/pkgs/build-support/build-dotnet-package/default.nix @@ -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" ] )) diff --git a/pkgs/top-level/dotnet-packages.nix b/pkgs/top-level/dotnet-packages.nix index 1ca8621b711..f0fcef73383 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 ? {} }: |