descent{1,2}-assets: set pname

pkgs/by-name/dx/dxx-rebirth/assets.nix

@@ -8,15 +8,12 @@
 let
   generic =
     ver: source:
-    let
-      pname = "descent${toString ver}";
-    in
-    stdenv.mkDerivation rec {
-      name = "${pname}-assets-${version}";
+    stdenv.mkDerivation (finalAttrs: {
+      pname = "descent${toString ver}-assets";
       version = "2.0.0.7";
 
       src = requireFile rec {
-        name = "setup_descent12_${version}.exe";
+        name = "setup_descent12_${finalAttrs.version}.exe";
         sha256 = "1r1drbfda6czg21f9qqiiwgnkpszxgmcn5bafp5ljddh34swkn3f";
         message = ''
           While the Descent ${toString ver} game engine is free, the game assets are not.
@@ -38,10 +35,10 @@ let
       installPhase = ''
         runHook preInstall
 
-        mkdir -p $out/share/{games/${pname},doc/${pname}/examples}
+        mkdir -p $out/share/{games/${finalAttrs.pname},doc/${finalAttrs.pname}/examples}
         pushd "app/${source}"
-        mv dosbox*.conf $out/share/doc/${pname}/examples
-        mv *.txt *.pdf  $out/share/doc/${pname}
+        mv dosbox*.conf $out/share/doc/${finalAttrs.pname}/examples
+        mv *.txt *.pdf  $out/share/doc/${finalAttrs.pname}
         cp -r * $out/share/games/descent${toString ver}
         popd
 
@@ -55,7 +52,7 @@ let
         maintainers = with lib.maintainers; [ peterhoeg ];
         hydraPlatforms = [ ];
       };
-    };
+    });
 
 in
 {