From db8501edda65d0d5eb95301f379bae7aeefd5407 Mon Sep 17 00:00:00 2001 From: quantenzitrone Date: Thu, 22 Jan 2026 07:10:26 +0100 Subject: [PATCH] arx-libertatis: move to pkgs/by-name this shouldn't create any rebuilds --- .../default.nix => by-name/ar/arx-libertatis/package.nix} | 7 +++---- pkgs/top-level/all-packages.nix | 2 -- 2 files changed, 3 insertions(+), 6 deletions(-) rename pkgs/{games/arx-libertatis/default.nix => by-name/ar/arx-libertatis/package.nix} (94%) diff --git a/pkgs/games/arx-libertatis/default.nix b/pkgs/by-name/ar/arx-libertatis/package.nix similarity index 94% rename from pkgs/games/arx-libertatis/default.nix rename to pkgs/by-name/ar/arx-libertatis/package.nix index 49a961d0c10a..4a31ab757b97 100644 --- a/pkgs/games/arx-libertatis/default.nix +++ b/pkgs/by-name/ar/arx-libertatis/package.nix @@ -16,8 +16,7 @@ optipng, imagemagick, withCrashReporter ? !stdenv.hostPlatform.isDarwin, - qtbase ? null, - wrapQtAppsHook ? null, + qt5, curl ? null, gdb ? null, }: @@ -49,7 +48,7 @@ stdenv.mkDerivation rec { imagemagick optipng ] - ++ optionals withCrashReporter [ wrapQtAppsHook ]; + ++ optionals withCrashReporter [ qt5.wrapQtAppsHook ]; buildInputs = [ zlib @@ -62,7 +61,7 @@ stdenv.mkDerivation rec { libepoxy ] ++ optionals withCrashReporter [ - qtbase + qt5.qtbase curl ] ++ optionals stdenv.hostPlatform.isLinux [ gdb ]; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 261898b19782..aa3dd3e4e2eb 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -12179,8 +12179,6 @@ with pkgs; anki-utils = callPackage ../by-name/an/anki/addons/anki-utils.nix { }; ankiAddons = recurseIntoAttrs (callPackage ../by-name/an/anki/addons { }); - arx-libertatis = libsForQt5.callPackage ../games/arx-libertatis { }; - beancount-ing-diba = callPackage ../applications/office/beancount/beancount-ing-diba.nix { inherit (python3Packages) beancount beangulp; };