diff --git a/pkgs/tools/misc/flameshot/default.nix b/pkgs/by-name/fl/flameshot/package.nix similarity index 82% rename from pkgs/tools/misc/flameshot/default.nix rename to pkgs/by-name/fl/flameshot/package.nix index 7b7b58381e9c..b5d47e9fec71 100644 --- a/pkgs/tools/misc/flameshot/default.nix +++ b/pkgs/by-name/fl/flameshot/package.nix @@ -1,16 +1,13 @@ -{ mkDerivation +{ libsForQt5 +, stdenv , lib , fetchFromGitHub -, qtbase , cmake -, qttools -, qtsvg , nix-update-script , fetchpatch -, kguiaddons }: -mkDerivation rec { +stdenv.mkDerivation rec { pname = "flameshot"; version = "12.1.0"; @@ -38,8 +35,17 @@ mkDerivation rec { (lib.cmakeBool "USE_WAYLAND_CLIPBOARD" true) ]; - nativeBuildInputs = [ cmake qttools qtsvg ]; - buildInputs = [ qtbase kguiaddons ]; + nativeBuildInputs = [ + cmake + libsForQt5.qttools + libsForQt5.qtsvg + libsForQt5.wrapQtAppsHook + ]; + + buildInputs = [ + libsForQt5.qtbase + libsForQt5.kguiaddons + ]; meta = with lib; { description = "Powerful yet simple to use screenshot software"; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 343d36b57e36..99457a98072e 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -30692,8 +30692,6 @@ with pkgs; redoflacs = callPackage ../applications/audio/redoflacs { }; - flameshot = libsForQt5.callPackage ../tools/misc/flameshot { }; - flex-ncat = callPackage ../applications/radio/flex-ncat { }; flex-ndax = callPackage ../applications/radio/flex-ndax { };