Commit f2f37583 authored by David McFarland's avatar David McFarland
Browse files

dotnet-sdk_{10,11}: provide $out/bin/dnx 

Fixes: #477657
parent 37b5be74

pkgs/development/compilers/dotnet/binary/build-dotnet.nix

+5 −0
Original line number Diff line number Diff line
@@ -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

    '';

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

+6 −3
Original line number Diff line number Diff line
@@ -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

pkgs/development/compilers/dotnet/source/packages.nix

+5 −0
Original line number Diff line number Diff line
@@ -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"/