mirror of
https://github.com/NixOS/nixpkgs.git
synced 2026-07-25 10:00:28 +00:00
nuget-to-nix: use dotnet from PATH
The dotnet sdk used usually needs to match the one required by the project (global.json). Having the dependcy in nix just meant it always had to be overridden.
This commit is contained in:
@@ -9,7 +9,6 @@
|
||||
, curl
|
||||
, gnugrep
|
||||
, gawk
|
||||
, dotnet-sdk
|
||||
}:
|
||||
|
||||
runCommandLocal "nuget-to-nix" {
|
||||
@@ -25,7 +24,6 @@ runCommandLocal "nuget-to-nix" {
|
||||
curl
|
||||
gnugrep
|
||||
gawk
|
||||
dotnet-sdk
|
||||
];
|
||||
};
|
||||
|
||||
|
||||
@@ -3,7 +3,7 @@
|
||||
set -euo pipefail
|
||||
shopt -s nullglob
|
||||
|
||||
export PATH="@binPath@"
|
||||
export PATH="@binPath@:$PATH"
|
||||
# used for glob ordering of package names
|
||||
export LC_ALL=C
|
||||
|
||||
|
||||
@@ -79,7 +79,7 @@ let
|
||||
nativeBuildInputs = old.nativeBuildInputs ++ [
|
||||
nix
|
||||
cacert
|
||||
(nuget-to-nix.override { dotnet-sdk = dotnetSdk; })
|
||||
nuget-to-nix
|
||||
];
|
||||
postPatch = old.postPatch or "" + ''
|
||||
xmlstarlet ed \
|
||||
|
||||
Reference in New Issue
Block a user