From 1d4d0d3db7a99b56dd101e4efa8d1b5621ea8a00 Mon Sep 17 00:00:00 2001
From: David McFarland <corngood@gmail.com>
Date: Sat, 7 Sep 2024 23:51:12 -0300
Subject: [PATCH] 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.
---
 pkgs/build-support/dotnet/nuget-to-nix/default.nix     | 2 --
 pkgs/build-support/dotnet/nuget-to-nix/nuget-to-nix.sh | 2 +-
 pkgs/development/compilers/dotnet/stage0.nix           | 2 +-
 3 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/pkgs/build-support/dotnet/nuget-to-nix/default.nix b/pkgs/build-support/dotnet/nuget-to-nix/default.nix
index 3fdda4ac68d3..c443e2ba6242 100644
--- a/pkgs/build-support/dotnet/nuget-to-nix/default.nix
+++ b/pkgs/build-support/dotnet/nuget-to-nix/default.nix
@@ -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
     ];
   };
 
diff --git a/pkgs/build-support/dotnet/nuget-to-nix/nuget-to-nix.sh b/pkgs/build-support/dotnet/nuget-to-nix/nuget-to-nix.sh
index 902f010a74e6..aae56c8ddfb1 100755
--- a/pkgs/build-support/dotnet/nuget-to-nix/nuget-to-nix.sh
+++ b/pkgs/build-support/dotnet/nuget-to-nix/nuget-to-nix.sh
@@ -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
 
diff --git a/pkgs/development/compilers/dotnet/stage0.nix b/pkgs/development/compilers/dotnet/stage0.nix
index 0bfdc15f5fa7..7e2717aba1a1 100644
--- a/pkgs/development/compilers/dotnet/stage0.nix
+++ b/pkgs/development/compilers/dotnet/stage0.nix
@@ -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 \