Create bundles without ZIP'ing them

Because GitHub Actions apparently does it itself.
Doom2D · Dec 20, 2024 · 2910e96 · 2910e96
1 parent e8813a3
commit 2910e96
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 31 deletions.
diff --git a/flake.nix b/flake.nix
@@ -76,7 +76,7 @@
       legacyPackages.mingw = (import ./packages/mingw.nix).default {
         inherit pkgs lib fpcPkgs d2dfPkgs;
         gameAssetsPath = defaultAssetsPath;
-        mkZipBundle = bundles.mkZipBundle;
+        mkGameBundle = bundles.mkGameBundle;
       };
 
       legacyPackages.fpc-git = pkgs.fpc;

diff --git a/game/bundle/default.nix b/game/bundle/default.nix
@@ -1,4 +1,4 @@
 {callPackage}: {
-  mkZipBundle = callPackage ./mkZipBundle.nix;
+  mkGameBundle = callPackage ./mkGameBundle.nix;
   mkAndroidApk = callPackage ./mkAndroidApk.nix;
 }
diff --git a/game/bundle/mkZipBundle.nix → game/bundle/mkGameBundle.nix b/game/bundle/mkZipBundle.nix → game/bundle/mkGameBundle.nix
@@ -47,29 +47,4 @@ let
         '';
     });
 in
-  {
-    zip,
-    stdenv,
-    callPackage,
-    gameAssetsPath,
-    unknownPkgsAttrs,
-    isWindows,
-    ...
-  }:
-    stdenv.mkDerivation (finalAttrs: {
-      version = "0.667-git";
-      pname = "d2df-game-bundle";
-      name = "${finalAttrs.pname}-${finalAttrs.version}";
-
-      dontStrip = true;
-      dontPatchELF = true;
-      dontBuild = true;
-
-      nativeBuildInputs = [zip];
-
-      src = callPackage gameBundle {inherit gameAssetsPath unknownPkgsAttrs isWindows;};
-
-      installPhase = ''
-        zip -r $out .
-      '';
-    })
+  gameBundle
diff --git a/packages/mingw.nix b/packages/mingw.nix
@@ -4,7 +4,7 @@
     lib,
     fpcPkgs,
     d2dfPkgs,
-    mkZipBundle,
+    mkGameBundle,
     gameAssetsPath,
   }: let
     mingwPkgs = import ../cross/mingw {
@@ -13,7 +13,7 @@
     };
     byArchAdditional =
       lib.mapAttrs (target: targetAttrs: let
-        doom2df-zip = mkZipBundle {
+        doom2df-bundle = mkGameBundle {
           inherit gameAssetsPath;
           unknownPkgsAttrs = {
             sharedBundledLibraries = [targetAttrs.enet targetAttrs.SDL2 targetAttrs.fmodex];
@@ -22,7 +22,7 @@
           isWindows = true;
         };
       in {
-        inherit doom2df-zip;
+        inherit doom2df-bundle;
       })
       mingwPkgs.byArch;
   in