diff --git a/pkgs/development/compilers/dotnet/binary/build-dotnet.nix b/pkgs/development/compilers/dotnet/binary/build-dotnet.nix index 3f023ff70757..b6c9165ae996 100644 --- a/pkgs/development/compilers/dotnet/binary/build-dotnet.nix +++ b/pkgs/development/compilers/dotnet/binary/build-dotnet.nix @@ -159,6 +159,11 @@ mkWrapper type ( mkdir -p $out/bin ln -s $out/share/dotnet/dotnet $out/bin/dotnet + '' + + lib.optionalString (type == "sdk" && lib.versionAtLeast version "10") '' + ln -s "$out"/share/dotnet/dnx "$out"/bin/dnx + '' + + '' runHook postInstall ''; diff --git a/pkgs/development/compilers/dotnet/combine-packages.nix b/pkgs/development/compilers/dotnet/combine-packages.nix index 1b08615b56e8..ef57378cda57 100644 --- a/pkgs/development/compilers/dotnet/combine-packages.nix +++ b/pkgs/development/compilers/dotnet/combine-packages.nix @@ -36,11 +36,14 @@ mkWrapper "sdk" ( ignoreCollisions = true; nativeBuildInputs = [ makeWrapper ]; postBuild = '' - mkdir -p "$out"/share/dotnet - cp "${cli}"/share/dotnet/dotnet $out/share/dotnet + mkdir -p "$out"/bin "$out"/share/dotnet cp -R "${cli}"/nix-support "$out"/ - mkdir "$out"/bin + cp "${cli}"/share/dotnet/dotnet $out/share/dotnet ln -s "$out"/share/dotnet/dotnet "$out"/bin/dotnet + if [[ -e "${cli}"/share/dotnet/dnx ]]; then + cp "${cli}"/share/dotnet/dnx $out/share/dotnet + ln -s "$out"/share/dotnet/dnx "$out"/bin/dnx + fi '' + lib.optionalString (cli ? man) '' ln -s ${cli.man} $man diff --git a/pkgs/development/compilers/dotnet/source/packages.nix b/pkgs/development/compilers/dotnet/source/packages.nix index 0b5f653c51ba..bc0cf31d32e5 100644 --- a/pkgs/development/compilers/dotnet/source/packages.nix +++ b/pkgs/development/compilers/dotnet/source/packages.nix @@ -148,6 +148,11 @@ let chmod +w "$out"/share/dotnet mkdir "$out"/bin ln -s "$out"/share/dotnet/dotnet "$out"/bin/dotnet + '' + + lib.optionalString (lib.versionAtLeast sdkVersion "10") '' + ln -s "$out"/share/dotnet/dnx "$out"/bin/dnx + '' + + '' mkdir -p "$artifacts" cp -r "$src"/lib/Private.SourceBuilt.Artifacts.*.${targetRid}/* "$artifacts"/