dfw-rs: rename dfwad to dfw-rs

Author: itazurasuki

flake.nix

@@ -55,7 +55,8 @@
             wadcvt = final.callPackage d2dfPkgs.wadcvt {
               inherit Doom2D-Forever;
             };
-            dfwad = final.callPackage d2dfPkgs.dfwad {};
+            dfw-rs = final.callPackage d2dfPkgs.dfw-rs {};
+            dfwad = lib.warn "dfwad is an alias of dfw-rs, so use that!" final.dfw-rs;
             cctools = osxcross.packages.${system}.cctools;
             macdylibbundler = prev.macdylibbundler.overrideAttrs (prevAttrs: let
               otool = final.writeShellScriptBin "otool" ''
@@ -120,7 +121,7 @@
 
       assets = import ./packages/assets.nix {
         inherit lib;
-        inherit (pkgs) callPackage stdenv writeText dfwad;
+        inherit (pkgs) callPackage stdenv writeText dfw-rs;
         inherit DF-Assets d2df-editor;
         inherit (d2dfPkgs) buildWad;
         inherit (assetsLib) mkAssetsPath;
@@ -151,7 +152,7 @@
         lib.recursiveUpdate cross aux;
 
       packages = {
-        inherit (pkgs) wadcvt dfwad;
+        inherit (pkgs) wadcvt dfw-rs dfwad;
       };
 
       forPrebuild = let
@@ -164,7 +165,7 @@
           acc
           // {
             "${cur}" =
-              pkgs.closureInfo {rootPaths = [(pkgs.linkFarmFromDrvs "cache-${cur}" drvs) pkgs.dfwad];};
+              pkgs.closureInfo {rootPaths = [(pkgs.linkFarmFromDrvs "cache-${cur}" drvs) pkgs.dfw-rs];};
           }) {}
         arches;
 

game/buildWad/default.nix

@@ -18,7 +18,7 @@ in {
     util-linux,
     bash,
     dos2unix,
-    dfwad,
+    dfw-rs,
     dfwadCompression ? "none",
     shouldNormalize ? true,
     normalizeBlacklist ? [],
@@ -40,7 +40,7 @@ in {
       dontFixup = true;
 
       nativeBuildInputs =
-        [bash gawk gnused convmv dfwad coreutils util-linux dos2unix]
+        [bash gawk gnused convmv dfw-rs coreutils util-linux dos2unix]
         ++ lib.optionals shouldNormalize [
           parallel
           findutils
@@ -85,7 +85,7 @@ in {
         + ''
           mkdir -p temp
           chmod -R 777 temp
-          echo "Moving files from ${lstPath} to dfwad suitable directory"
+          echo "Moving files from ${lstPath} to dfw-rs suitable directory"
           ${gawk}/bin/awk -f ${buildWadScript} -v prefix="temp" ${lstPath}
           # For some reason, this AWK script sets wrong perms
           chmod -R 777 temp
@@ -97,8 +97,8 @@ in {
                      echo "moving $1 to $(dirname $1)/$WITHOUT_EXT";
                      mv "$1" "$(dirname $1)/$WITHOUT_EXT";
                      ' bash {} \;
-          echo "Calling ${lib.getExe dfwad}"
-          ${lib.getExe dfwad} -v -z "${dfwadCompression}" temp/ ${outName}.wad pack
+          echo "Calling dfw-rs"
+          dfw-rs -v -z "${dfwadCompression}" temp/ ${outName}.wad pack
         '';
 
       installPhase = ''

game/default.nix

@@ -4,7 +4,7 @@
   doom2d-multiplayer-game-data = import ./d2dmpData.nix;
   editor = import ./editor;
   wadcvt = import ./utils/wadcvt.nix;
-  dfwad = import ./utils/dfwad.nix;
+  dfw-rs = import ./utils/dfw-rs.nix;
   doom2df-bundle = import ./bundle;
   buildWad = (import ./buildWad).buildWad;
   buildWadScript = (import ./buildWad).buildWadScript;

game/utils/dfwad.nix game/utils/dfw-rs.nixgame/utils/dfwad.nix renamed to game/utils/dfw-rs.nix

@@ -6,7 +6,7 @@
   DF-Assets,
   d2df-editor,
   buildWad,
-  dfwad,
+  dfw-rs,
   mkAssetsPath,
 }: rec {
   wads = lib.listToAttrs (lib.map (wad: {
@@ -18,7 +18,7 @@
         lstPath = "${wad.out}.lst";
         dfwadCompression = "best";
         inherit DF-Assets;
-        inherit dfwad;
+        inherit dfw-rs;
       };
     }) [
       {