diff --git a/pkgs/games/zandronum/add_gitinfo.patch b/pkgs/games/doom-ports/zandronum/add_gitinfo.patch similarity index 100% rename from pkgs/games/zandronum/add_gitinfo.patch rename to pkgs/games/doom-ports/zandronum/add_gitinfo.patch diff --git a/pkgs/games/zandronum/default.nix b/pkgs/games/doom-ports/zandronum/default.nix similarity index 100% rename from pkgs/games/zandronum/default.nix rename to pkgs/games/doom-ports/zandronum/default.nix diff --git a/pkgs/games/zandronum/dont_update_gitinfo.patch b/pkgs/games/doom-ports/zandronum/dont_update_gitinfo.patch similarity index 100% rename from pkgs/games/zandronum/dont_update_gitinfo.patch rename to pkgs/games/doom-ports/zandronum/dont_update_gitinfo.patch diff --git a/pkgs/games/zandronum/fmod.nix b/pkgs/games/doom-ports/zandronum/fmod.nix similarity index 100% rename from pkgs/games/zandronum/fmod.nix rename to pkgs/games/doom-ports/zandronum/fmod.nix diff --git a/pkgs/games/zandronum/sqlite.nix b/pkgs/games/doom-ports/zandronum/sqlite.nix similarity index 100% rename from pkgs/games/zandronum/sqlite.nix rename to pkgs/games/doom-ports/zandronum/sqlite.nix diff --git a/pkgs/games/zandronum/zan_configure_impurity.patch b/pkgs/games/doom-ports/zandronum/zan_configure_impurity.patch similarity index 100% rename from pkgs/games/zandronum/zan_configure_impurity.patch rename to pkgs/games/doom-ports/zandronum/zan_configure_impurity.patch diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 41209ce6793b..c7eab8b3190f 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -35717,8 +35717,6 @@ with pkgs; ezquake = callPackage ../games/ezquake { }; - fmodex = callPackage ../games/zandronum/fmod.nix { }; - freedroid = callPackage ../games/freedroid { }; freedroidrpg = callPackage ../games/freedroidrpg { }; @@ -35761,6 +35759,14 @@ with pkgs; rbdoom-3-bfg = callPackage ../games/doom-ports/rbdoom-3-bfg { }; + zandronum = callPackage ../games/doom-ports/zandronum { }; + + zandronum-server = zandronum.override { + serverOnly = true; + }; + + fmodex = callPackage ../games/doom-ports/zandronum/fmod.nix { }; + ### GAMES/LGAMES barrage = callPackage ../games/lgames/barrage { }; @@ -36929,12 +36935,6 @@ with pkgs; yquake2-the-reckoning yquake2-all-games; - zandronum = callPackage ../games/zandronum { }; - - zandronum-server = zandronum.override { - serverOnly = true; - }; - zaz = callPackage ../games/zaz { }; zdbsp = callPackage ../games/zdoom/zdbsp.nix { };