From 695d500a24f7fc7a8b7d6f0511bceaff6893e5cc Mon Sep 17 00:00:00 2001 From: Aliaksandr Date: Sat, 3 Jan 2026 02:41:55 +0200 Subject: [PATCH] maskromtool: move to by-name --- .../default.nix => by-name/ma/maskromtool/package.nix} | 6 ++---- pkgs/top-level/all-packages.nix | 2 -- 2 files changed, 2 insertions(+), 6 deletions(-) rename pkgs/{tools/graphics/maskromtool/default.nix => by-name/ma/maskromtool/package.nix} (92%) diff --git a/pkgs/tools/graphics/maskromtool/default.nix b/pkgs/by-name/ma/maskromtool/package.nix similarity index 92% rename from pkgs/tools/graphics/maskromtool/default.nix rename to pkgs/by-name/ma/maskromtool/package.nix index 94fbfdb61fe0..fc96dfd5603e 100644 --- a/pkgs/tools/graphics/maskromtool/default.nix +++ b/pkgs/by-name/ma/maskromtool/package.nix @@ -3,9 +3,7 @@ stdenv, fetchFromGitHub, cmake, - qtbase, qt6, - wrapQtAppsHook, }: stdenv.mkDerivation rec { @@ -20,14 +18,14 @@ stdenv.mkDerivation rec { }; buildInputs = [ - qtbase + qt6.qtbase qt6.qtcharts qt6.qttools ]; nativeBuildInputs = [ cmake - wrapQtAppsHook + qt6.wrapQtAppsHook ]; meta = { diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 095f16d10bb1..c0ee6da108a4 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -2893,8 +2893,6 @@ with pkgs; kzipmix = pkgsi686Linux.callPackage ../tools/compression/kzipmix { }; - maskromtool = qt6Packages.callPackage ../tools/graphics/maskromtool { }; - matrix-synapse-plugins = recurseIntoAttrs matrix-synapse-unwrapped.plugins; maubot = with python3Packages; toPythonApplication maubot;