Add utils to flake packages again

Doom2D · Jan 5, 2025 · 5e5276e · 5e5276e
1 parent 89e756e
commit 5e5276e
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 10 deletions.
diff --git a/flake.nix b/flake.nix
@@ -42,6 +42,9 @@
         };
         overlays = [
           (final: prev: {
+            wadcvt = final.callPackage d2dfPkgs.wadcvt {
+              inherit d2df-sdl;
+            };
             dfwad = final.callPackage d2dfPkgs.dfwad {};
           })
         ];
@@ -89,15 +92,19 @@
 
       inherit pins;
 
-      legacyPackages = import ./packages {
-        inherit lib;
-        inherit pins;
-        inherit (pkgs) callPackage;
-        inherit (assetsLib) androidRoot androidIcons;
-        defaultAssetsPath = self.assets.${system}.defaultAssetsPath;
-        inherit (bundles) mkExecutablePath mkGamePath mkAndroidApk;
-        executablesAttrs = self.executables.${system};
-      };
+      legacyPackages =
+        (import ./packages {
+          inherit lib;
+          inherit pins;
+          inherit (pkgs) callPackage;
+          inherit (assetsLib) androidRoot androidIcons;
+          defaultAssetsPath = self.assets.${system}.defaultAssetsPath;
+          inherit (bundles) mkExecutablePath mkGamePath mkAndroidApk;
+          executablesAttrs = self.executables.${system};
+        })
+        // {
+          inherit (pkgs) wadcvt dfwad;
+        };
 
       forPrebuild = let
         thisPkgs = self.legacyPackages.${system};

diff --git a/game/utils/wadcvt.nix b/game/utils/wadcvt.nix
@@ -22,6 +22,7 @@ stdenv.mkDerivation (finalAttrs: {
   '';
 
   installPhase = ''
-    cp src/tools/wadcvt $out
+    mkdir -p $out/bin
+    cp src/tools/wadcvt $out/bin
   '';
 })