Merge pull request #249091 from TomaSajt/dotnet-fix

Fix useDotnetFromEnv's DOTNET_ROOT detection

pkgs/build-support/dotnet/build-dotnet-module/hooks/default.nix

···
         shell = stdenv.shell;
         which = "${which}/bin/which";
         dirname = "${coreutils}/bin/dirname";
+        realpath = "${coreutils}/bin/realpath";
       };
     } ./dotnet-fixup-hook.sh) { };
 }

pkgs/build-support/dotnet/build-dotnet-module/hooks/dotnet-fixup-hook.sh

···
     if [ ! "${selfContainedBuild-}" ]; then
         if [ "${useDotnetFromEnv-}" ]; then
             # if dotnet CLI is available, set DOTNET_ROOT based on it. Otherwise set to default .NET runtime
-            dotnetRootFlags+=("--run" 'command -v dotnet &>/dev/null && export DOTNET_ROOT="$(@dirname@ "$(@dirname@ "$(@which@ dotnet)")")" || export DOTNET_ROOT="@dotnetRuntime@"')
+            dotnetRootFlags+=("--run" 'command -v dotnet &>/dev/null && export DOTNET_ROOT="$(@dirname@ "$(@realpath@ "$(@which@ dotnet)")")" || export DOTNET_ROOT="@dotnetRuntime@"')
             dotnetRootFlags+=("--suffix" "PATH" ":" "@dotnetRuntime@/bin")
         else
             dotnetRootFlags+=("--set" "DOTNET_ROOT" "@dotnetRuntime@")

pkgs/development/compilers/dotnet/combine-packages.nix

···
     paths = dotnetPackages;
     pathsToLink = [ "/host" "/packs" "/sdk" "/sdk-manifests" "/shared" "/templates" ];
     ignoreCollisions = true;
-    nativeBuildInputs = [
-      makeWrapper
-    ];
     postBuild = ''
       cp -R ${cli}/{dotnet,share,nix-support} $out/
 
       mkdir $out/bin
       ln -s $out/dotnet $out/bin/dotnet
-      wrapProgram $out/bin/dotnet \
-        --prefix LD_LIBRARY_PATH : ${cli.icu}/lib
     '';
     passthru = {
       inherit (cli) icu;