diff --git a/pkgs/games/doom-ports/slade/git.nix b/pkgs/by-name/sl/slade-unstable/package.nix similarity index 88% rename from pkgs/games/doom-ports/slade/git.nix rename to pkgs/by-name/sl/slade-unstable/package.nix index 75938f8c8c8f..d9b7d2b05bc2 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"; @@ -72,7 +72,9 @@ stdenv.mkDerivation { meta = { description = "Doom editor"; homepage = "http://slade.mancubus.net/"; + mainProgram = "slade"; license = lib.licenses.gpl2Only; # https://github.com/sirjuddington/SLADE/issues/1754 platforms = lib.platforms.linux; + maintainers = with lib.maintainers; [ Gliczy ]; }; } diff --git a/pkgs/games/doom-ports/slade/default.nix b/pkgs/by-name/sl/slade/package.nix similarity index 75% rename from pkgs/games/doom-ports/slade/default.nix rename to pkgs/by-name/sl/slade/package.nix index e804417ee625..d01793cdd99c 100644 --- a/pkgs/games/doom-ports/slade/default.nix +++ b/pkgs/by-name/sl/slade/package.nix @@ -6,7 +6,7 @@ pkg-config, which, zip, - wxGTK, + wxGTK32, gtk3, sfml_2, fluidsynth, @@ -19,14 +19,14 @@ wrapGAppsHook3, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "slade"; version = "3.2.7"; src = fetchFromGitHub { owner = "sirjuddington"; repo = "SLADE"; - rev = version; + tag = finalAttrs.version; hash = "sha256-+i506uzO2q/9k7en6CKs4ui9gjszrMOYwW+V9W5Lvns="; }; @@ -39,7 +39,7 @@ stdenv.mkDerivation rec { ]; buildInputs = [ - wxGTK + wxGTK32 gtk3 sfml_2 fluidsynth @@ -52,8 +52,8 @@ stdenv.mkDerivation rec { ]; 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"; @@ -67,8 +67,10 @@ stdenv.mkDerivation rec { meta = { description = "Doom editor"; homepage = "http://slade.mancubus.net/"; + changelog = "https://github.com/sirjuddington/SLADE/releases/tag/${finalAttrs.version}"; + mainProgram = "slade"; license = lib.licenses.gpl2Only; # https://github.com/sirjuddington/SLADE/issues/1754 platforms = lib.platforms.linux; - maintainers = [ ]; + maintainers = with lib.maintainers; [ Gliczy ]; }; -} +}) diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index 2d3fcb430b0a..145fddcfad51 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -2130,6 +2130,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 66ee99867806..8570a74fa8e6 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -13846,18 +13846,6 @@ with pkgs; enyo-launcher = libsForQt5.callPackage ../games/doom-ports/enyo-launcher { }; - slade = callPackage ../games/doom-ports/slade { - wxGTK = wxGTK32.override { - withWebKit = true; - }; - }; - - sladeUnstable = callPackage ../games/doom-ports/slade/git.nix { - wxGTK = wxGTK32.override { - withWebKit = true; - }; - }; - zandronum = callPackage ../games/doom-ports/zandronum { }; zandronum-server = zandronum.override {