From 31d77f9ef9cc87a6b6bd4f0a595f1d729808262d Mon Sep 17 00:00:00 2001 From: Gaetan Lepage Date: Thu, 6 Mar 2025 10:25:25 +0100 Subject: [PATCH] hydrus: move to by-name --- .../default.nix => by-name/hy/hydrus/package.nix} | 11 ++++------- pkgs/top-level/all-packages.nix | 5 ----- 2 files changed, 4 insertions(+), 12 deletions(-) rename pkgs/{applications/graphics/hydrus/default.nix => by-name/hy/hydrus/package.nix} (97%) diff --git a/pkgs/applications/graphics/hydrus/default.nix b/pkgs/by-name/hy/hydrus/package.nix similarity index 97% rename from pkgs/applications/graphics/hydrus/default.nix rename to pkgs/by-name/hy/hydrus/package.nix index 51bcfadb4151..cbf8219de217 100644 --- a/pkgs/applications/graphics/hydrus/default.nix +++ b/pkgs/by-name/hy/hydrus/package.nix @@ -1,15 +1,12 @@ { lib, fetchFromGitHub, - wrapQtAppsHook, miniupnpc, ffmpeg, enableSwftools ? false, swftools, python3Packages, - pythonOlder, - qtbase, - qtcharts, + qt6, makeDesktopItem, copyDesktopItems, }: @@ -27,14 +24,14 @@ python3Packages.buildPythonPackage rec { }; nativeBuildInputs = [ - wrapQtAppsHook + qt6.wrapQtAppsHook python3Packages.mkdocs-material copyDesktopItems ]; buildInputs = [ - qtbase - qtcharts + qt6.qtbase + qt6.qtcharts ]; desktopItems = [ diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 9dc3848b4a9f..a66d8537bd15 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -13502,11 +13502,6 @@ with pkgs; gtk-pipe-viewer = perlPackages.callPackage ../applications/video/pipe-viewer { withGtk3 = true; }; - hydrus = python3Packages.callPackage ../applications/graphics/hydrus { - inherit miniupnpc swftools; - inherit (qt6) wrapQtAppsHook qtbase qtcharts; - }; - kemai = qt6Packages.callPackage ../applications/misc/kemai { }; jetbrains = (recurseIntoAttrs (callPackages ../applications/editors/jetbrains {