From 44c9f687aea7eff0e89ecc6c618d80bb7f650c1a Mon Sep 17 00:00:00 2001 From: Gliczy <129636582+Gliczy@users.noreply.github.com> Date: Tue, 26 Aug 2025 18:28:00 +0200 Subject: [PATCH] slade: move to by-name --- .../slade/default.nix => by-name/sl/slade/package.nix} | 8 ++++---- pkgs/top-level/all-packages.nix | 6 ------ 2 files changed, 4 insertions(+), 10 deletions(-) rename pkgs/{games/doom-ports/slade/default.nix => by-name/sl/slade/package.nix} (92%) diff --git a/pkgs/games/doom-ports/slade/default.nix b/pkgs/by-name/sl/slade/package.nix similarity index 92% rename from pkgs/games/doom-ports/slade/default.nix rename to pkgs/by-name/sl/slade/package.nix index e804417ee625..994e37dab762 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, @@ -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"; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index fd93bce55693..a15dde92a185 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 { }; - slade = callPackage ../games/doom-ports/slade { - wxGTK = wxGTK32.override { - withWebKit = true; - }; - }; - sladeUnstable = callPackage ../games/doom-ports/slade/git.nix { wxGTK = wxGTK32.override { withWebKit = true;