diff --git a/pkgs/by-name/kr/krop/package.nix b/pkgs/by-name/kr/krop/package.nix index 889cd4317e04..6fece014dffa 100644 --- a/pkgs/by-name/kr/krop/package.nix +++ b/pkgs/by-name/kr/krop/package.nix @@ -1,62 +1,38 @@ { lib, + python3Packages, fetchFromGitHub, - python3, libsForQt5, ghostscript, - qt5, - fetchPypi, }: -let - py = python3.override { - self = py; - packageOverrides = self: super: { - # Can be removed once this is merged - # https://github.com/arminstraub/krop/pull/40 - pypdf2 = super.pypdf2.overridePythonAttrs (oldAttrs: rec { - version = "2.12.1"; - src = fetchPypi { - pname = "PyPDF2"; - inherit version; - hash = "sha256-4D7xirzHXadBoKzBp3SSU0loh744zZiHvM4c7jk9pF4="; - }; - }); - }; - }; -in - -py.pkgs.buildPythonApplication rec { +python3Packages.buildPythonApplication rec { pname = "krop"; - version = "0.6.0"; + version = "0.7.0"; src = fetchFromGitHub { owner = "arminstraub"; - repo = pname; - rev = "v${version}"; - sha256 = "1ygzc7vlwszqmsd3v1dsqp1dpsn6inx7g8gck63alvf88dbn8m3s"; + repo = "krop"; + tag = "v${version}"; + hash = "sha256-8mhTUP0oS+AnZXVmywxBTbR1OOg18U0RQ1H9lyjaiVI="; }; - propagatedBuildInputs = with py.pkgs; [ - pyqt5 - pypdf2 - poppler-qt5 - ghostscript - ]; + nativeBuildInputs = [ libsForQt5.wrapQtAppsHook ]; buildInputs = [ libsForQt5.poppler libsForQt5.qtwayland ]; - nativeBuildInputs = [ qt5.wrapQtAppsHook ]; + dependencies = with python3Packages; [ + pyqt5 + pypdf2 + poppler-qt5 + ghostscript + ]; makeWrapperArgs = [ "\${qtWrapperArgs[@]}" ]; - postInstall = '' - install -m666 -Dt $out/share/applications krop.desktop - ''; - # Disable checks because of interference with older Qt versions // xcb doCheck = false;