From daff458644db36d67476e4637baa15d7bebac82f Mon Sep 17 00:00:00 2001 From: Arnout Engelen Date: Wed, 16 Apr 2025 15:02:32 +0200 Subject: [PATCH] inkcut: move to pkgs/by-name --- .../inkcut/default.nix => by-name/in/inkcut/package.nix} | 6 +++--- pkgs/top-level/all-packages.nix | 2 -- 2 files changed, 3 insertions(+), 5 deletions(-) rename pkgs/{applications/misc/inkcut/default.nix => by-name/in/inkcut/package.nix} (95%) diff --git a/pkgs/applications/misc/inkcut/default.nix b/pkgs/by-name/in/inkcut/package.nix similarity index 95% rename from pkgs/applications/misc/inkcut/default.nix rename to pkgs/by-name/in/inkcut/package.nix index cf0a61e62fbc..8388db0abcc6 100644 --- a/pkgs/applications/misc/inkcut/default.nix +++ b/pkgs/by-name/in/inkcut/package.nix @@ -3,7 +3,7 @@ fetchpatch, python3, fetchFromGitHub, - wrapQtAppsHook, + qt5, cups, }: @@ -15,7 +15,7 @@ python3.pkgs.buildPythonApplication rec { owner = pname; repo = pname; tag = "v${version}"; - sha256 = "sha256-S5IrNWVoUp1w+P7DrKlOUOyY3Q16CHSct9ndZOB3UpU="; + hash = "sha256-S5IrNWVoUp1w+P7DrKlOUOyY3Q16CHSct9ndZOB3UpU="; }; patches = [ @@ -45,7 +45,7 @@ python3.pkgs.buildPythonApplication rec { --replace ", 'lpr', " ", '${cups}/bin/lpr', " ''; - nativeBuildInputs = [ wrapQtAppsHook ]; + nativeBuildInputs = [ qt5.wrapQtAppsHook ]; propagatedBuildInputs = with python3.pkgs; [ enamlx diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 44ec2f5dc1f3..62972d924d3f 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -14914,8 +14914,6 @@ with pkgs; imgp = python3Packages.callPackage ../applications/graphics/imgp { }; - inkcut = libsForQt5.callPackage ../applications/misc/inkcut { }; - inkscape = callPackage ../applications/graphics/inkscape { lcms = lcms2; };