diff --git a/pkgs/games/doom-ports/slade/git.nix b/pkgs/by-name/sl/slade-unstable/package.nix similarity index 93% rename from pkgs/games/doom-ports/slade/git.nix rename to pkgs/by-name/sl/slade-unstable/package.nix index 75938f8c8c8f..e8585e325b49 100644 --- a/pkgs/games/doom-ports/slade/git.nix +++ b/pkgs/by-name/sl/slade-unstable/package.nix @@ -6,7 +6,7 @@ pkg-config, which, zip, - wxGTK, + wxGTK32, gtk3, sfml_2, fluidsynth, @@ -40,7 +40,7 @@ stdenv.mkDerivation { ]; buildInputs = [ - wxGTK + wxGTK32 gtk3 sfml_2 fluidsynth @@ -53,8 +53,8 @@ stdenv.mkDerivation { ]; cmakeFlags = [ - "-DwxWidgets_LIBRARIES=${wxGTK}/lib" - (lib.cmakeFeature "CL_WX_CONFIG" (lib.getExe' (lib.getDev wxGTK) "wx-config")) + "-DwxWidgets_LIBRARIES=${wxGTK32}/lib" + (lib.cmakeFeature "CL_WX_CONFIG" (lib.getExe' (lib.getDev wxGTK32) "wx-config")) ]; env.NIX_CFLAGS_COMPILE = "-Wno-narrowing"; diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index 58e7cf890438..54dbf3106912 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -2123,6 +2123,7 @@ mapAliases { SkypeExport = skypeexport; # Added 2024-06-12 skypeforlinux = throw "Skype has been shut down in May 2025"; # Added 2025-05-05 slack-dark = throw "'slack-dark' has been renamed to/replaced by 'slack'"; # Converted to throw 2024-10-17 + sladeUnstable = slade-unstable; # Added 2025-08-26 slic3r = throw "'slic3r' has been removed because it is unmaintained"; # Added 2025-08-26 slimerjs = throw "slimerjs does not work with any version of Firefox newer than 59; upstream ended the project in 2021. "; # added 2025-01-06 sloccount = throw "'sloccount' has been removed because it is unmaintained. Consider migrating to 'loccount'"; # added 2025-05-17 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index a15dde92a185..3976e32bc24d 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -13867,12 +13867,6 @@ with pkgs; enyo-launcher = libsForQt5.callPackage ../games/doom-ports/enyo-launcher { }; - sladeUnstable = callPackage ../games/doom-ports/slade/git.nix { - wxGTK = wxGTK32.override { - withWebKit = true; - }; - }; - zandronum = callPackage ../games/doom-ports/zandronum { }; zandronum-server = zandronum.override {