1 files changed, 22 insertions, 13 deletions
diff --git a/pkgs/development/compilers/dotnet/packages.nix b/pkgs/development/compilers/dotnet/packages.nix
index 93538bf51212..2bbbfb7ae101 100644
--- a/pkgs/development/compilers/dotnet/packages.nix
+++ b/pkgs/development/compilers/dotnet/packages.nix
@@ -32,6 +32,9 @@ let
       )
     );
   inherit (vmr) targetRid releaseManifest;
+  sdkVersion = releaseManifest.sdkVersion;
+  runtimeVersion = releaseManifest.runtimeVersion;
+  aspnetcoreVersion = releaseManifest.aspNetCoreVersion or releaseManifest.runtimeVersion;
 
   # TODO: do this properly
   hostRid = targetRid;
@@ -114,9 +117,9 @@ let
     ];
   };
 
-  sdk = mkCommon "sdk" rec {
+  sdk = mkCommon "sdk" {
     pname = "${baseName}-sdk";
-    version = releaseManifest.sdkVersion;
+    version = sdkVersion;
 
     src = vmr;
     dontUnpack = true;
@@ -136,7 +139,7 @@ let
       runHook preInstall
 
       mkdir -p "$out"/share
-      cp -r "$src"/dotnet-sdk-${version}-${targetRid} "$out"/share/dotnet
+      cp -r "$src"/lib/dotnet-sdk-${sdkVersion}-${targetRid} "$out"/share/dotnet
       chmod +w "$out"/share/dotnet
       mkdir "$out"/bin
       ln -s "$out"/share/dotnet/dotnet "$out"/bin/dotnet
@@ -158,10 +161,16 @@ let
       runHook postInstall
     '';
 
-    ${if stdenvNoCC.isDarwin && lib.versionAtLeast version "10" then "postInstall" else null} = ''
-      mkdir -p "$out"/nix-support
-      cp "$src"/nix-support/manual-sdk-deps "$out"/nix-support/manual-sdk-deps
-    '';
+    ${
+      if stdenvNoCC.hostPlatform.isDarwin && lib.versionAtLeast sdkVersion "10" then
+        "postInstall"
+      else
+        null
+    } =
+      ''
+        mkdir -p "$out"/nix-support
+        cp "$src"/nix-support/manual-sdk-deps "$out"/nix-support/manual-sdk-deps
+      '';
 
     passthru = {
       inherit (vmr) icu targetRid hasILCompiler;
@@ -179,9 +188,9 @@ let
     };
   };
 
-  runtime = mkCommon "runtime" rec {
+  runtime = mkCommon "runtime" {
     pname = "${baseName}-runtime";
-    version = releaseManifest.runtimeVersion;
+    version = runtimeVersion;
 
     src = vmr;
     dontUnpack = true;
@@ -190,7 +199,7 @@ let
       runHook preInstall
 
       mkdir -p "$out"/share
-      cp -r "$src/dotnet-runtime-${version}-${targetRid}" "$out"/share/dotnet
+      cp -r "$src/lib/dotnet-runtime-${runtimeVersion}-${targetRid}" "$out"/share/dotnet
       chmod +w "$out"/share/dotnet
       mkdir "$out"/bin
       ln -s "$out"/share/dotnet/dotnet "$out"/bin/dotnet
@@ -207,9 +216,9 @@ let
     };
   };
 
-  aspnetcore = mkCommon "aspnetcore" rec {
+  aspnetcore = mkCommon "aspnetcore" {
     pname = "${baseName}-aspnetcore-runtime";
-    version = releaseManifest.aspNetCoreVersion or releaseManifest.runtimeVersion;
+    version = aspnetcoreVersion;
 
     src = vmr;
     dontUnpack = true;
@@ -223,7 +232,7 @@ let
       mkdir "$out"/bin
       ln -s "$out"/share/dotnet/dotnet "$out"/bin/dotnet
 
-      cp -Tr "$src/aspnetcore-runtime-${version}-${targetRid}"/shared/Microsoft.AspNetCore.App "$out"/share/dotnet/shared/Microsoft.AspNetCore.App
+      cp -Tr "$src/lib/aspnetcore-runtime-${aspnetcoreVersion}-${targetRid}"/shared/Microsoft.AspNetCore.App "$out"/share/dotnet/shared/Microsoft.AspNetCore.App
       chmod +w "$out"/share/dotnet/shared
 
       runHook postInstall