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] 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 {