From 12fced4f0ebb159fa2b382bb6f863bb40916169b Mon Sep 17 00:00:00 2001
From: pancaek <20342389+pancaek@users.noreply.github.com>
Date: Sat, 3 Jan 2026 12:15:19 -0800
Subject: [PATCH 1/2] fltrator: move to by-name/

---
 .../default.nix => by-name/fl/fltrator/package.nix}    | 10 +++++-----
 pkgs/top-level/all-packages.nix                        |  4 ----
 2 files changed, 5 insertions(+), 9 deletions(-)
 rename pkgs/{games/fltrator/default.nix => by-name/fl/fltrator/package.nix} (91%)

diff --git a/pkgs/games/fltrator/default.nix b/pkgs/by-name/fl/fltrator/package.nix
similarity index 91%
rename from pkgs/games/fltrator/default.nix
rename to pkgs/by-name/fl/fltrator/package.nix
index 63d80f7b34f2..2550702f516c 100644
--- a/pkgs/games/fltrator/default.nix
+++ b/pkgs/by-name/fl/fltrator/package.nix
@@ -3,22 +3,22 @@
   stdenv,
   fetchurl,
   unzip,
-  fltk,
+  fltk-minimal,
   which,
   libjpeg,
 }:
 
-stdenv.mkDerivation rec {
+stdenv.mkDerivation (finalAttrs: {
   pname = "fltrator";
   version = "2.3";
 
   src = fetchurl {
-    url = "mirror://sourceforge/fltrator/fltrator-${version}-code.zip";
+    url = "mirror://sourceforge/fltrator/fltrator-${finalAttrs.version}-code.zip";
     sha256 = "125aqq1sfrm0c9cm6gyylwdmc8xrb0rjf563xvw7q28sdbl6ayp7";
   };
 
   buildInputs = [
-    fltk
+    fltk-minimal
     libjpeg
   ];
   nativeBuildInputs = [
@@ -61,4 +61,4 @@ stdenv.mkDerivation rec {
     license = lib.licenses.gpl3;
   };
 
-}
+})
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index e641a167e423..eb10719e81a7 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -12595,10 +12595,6 @@ with pkgs;
     d2x-rebirth-full
     ;
 
-  fltrator = callPackage ../games/fltrator {
-    fltk = fltk-minimal;
-  };
-
   factorio = callPackage ../by-name/fa/factorio/package.nix { releaseType = "alpha"; };
 
   factorio-experimental = factorio.override {

From c23e6c3d969e926476016f5eceef0c0690607b67 Mon Sep 17 00:00:00 2001
From: pancaek <20342389+pancaek@users.noreply.github.com>
Date: Sat, 3 Jan 2026 12:19:23 -0800
Subject: [PATCH 2/2] gscrabble: drop

---
 pkgs/games/gscrabble/default.nix | 64 --------------------------------
 pkgs/top-level/aliases.nix       |  1 +
 pkgs/top-level/all-packages.nix  |  2 -
 3 files changed, 1 insertion(+), 66 deletions(-)
 delete mode 100644 pkgs/games/gscrabble/default.nix

diff --git a/pkgs/games/gscrabble/default.nix b/pkgs/games/gscrabble/default.nix
deleted file mode 100644
index fe4a5a0b8dd4..000000000000
--- a/pkgs/games/gscrabble/default.nix
+++ /dev/null
@@ -1,64 +0,0 @@
-{
-  lib,
-  buildPythonApplication,
-  fetchFromGitHub,
-  gtk3,
-  wrapGAppsHook3,
-  gst_all_1,
-  gobject-introspection,
-  gst-python,
-  pygobject3,
-  adwaita-icon-theme,
-}:
-
-buildPythonApplication {
-  pname = "gscrabble";
-  version = "unstable-2020-04-21";
-  format = "setuptools";
-
-  src = fetchFromGitHub {
-    owner = "RaaH";
-    repo = "gscrabble";
-    rev = "aba37f062a6b183dcc084c453f395af1dc437ec8";
-    sha256 = "sha256-rYpPHgOlPRnlA+Nkvo/J+/8/vl24/Ssk55fTq9oNCz4=";
-  };
-
-  doCheck = false;
-
-  nativeBuildInputs = [
-    wrapGAppsHook3
-    gobject-introspection
-  ];
-
-  buildInputs = with gst_all_1; [
-    gst-plugins-base
-    gst-plugins-good
-    gst-plugins-ugly
-    gst-plugins-bad
-    adwaita-icon-theme
-    gtk3
-  ];
-
-  propagatedBuildInputs = [
-    gst-python
-    pygobject3
-  ];
-
-  preFixup = ''
-    gappsWrapperArgs+=(
-      --prefix PYTHONPATH : "$out/share/GScrabble/modules"
-      )
-  '';
-
-  meta = {
-    # Fails to build, probably incompatible with latest Python
-    # error: Multiple top-level packages discovered in a flat-layout
-    # https://github.com/RaaH/gscrabble/issues/13
-    broken = true;
-    description = "Golden Scrabble crossword puzzle game";
-    homepage = "https://github.com/RaaH/gscrabble/";
-    license = lib.licenses.gpl2Plus;
-    platforms = lib.platforms.linux;
-    maintainers = with lib.maintainers; [ onny ];
-  };
-}
diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix
index 274d6d29b018..fc0a98c2a0c3 100644
--- a/pkgs/top-level/aliases.nix
+++ b/pkgs/top-level/aliases.nix
@@ -731,6 +731,7 @@ mapAliases {
   graphite-kde-theme = throw "'graphite-kde-theme' has been removed, as it is only compatible with Plasma 5, which is EOL"; # Added 2025-08-20
   gringo = throw "'gringo' has been renamed to/replaced by 'clingo'"; # Converted to throw 2025-10-27
   grub2_full = throw "'grub2_full' has been renamed to/replaced by 'grub2'"; # Converted to throw 2025-10-27
+  gscrabble = throw "'gscrabble' has been removed, as it is unmaintained upstream, and broken in nixpkgs"; # Added 2026-01-03
   gsettings-qt = lomiri.gsettings-qt; # Added 2025-12-06
   gtkcord4 = throw "'gtkcord4' has been renamed to/replaced by 'dissent'"; # Converted to throw 2025-10-27
   gtkextra = throw "'gtkextra' has been removed due to lack of maintenance upstream."; # Added 2025-06-10
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index eb10719e81a7..5aeb8d1a48de 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -12645,8 +12645,6 @@ with pkgs;
 
   freeciv_gtk = freeciv;
 
-  gscrabble = python3Packages.callPackage ../games/gscrabble { };
-
   ibmcloud-cli = callPackage ../tools/admin/ibmcloud-cli { stdenv = stdenvNoCC; };
 
   # used as base package for iortcw forks