diff --git a/pkgs/applications/misc/qpdfview/qpdfview-qt515-compat.patch b/pkgs/applications/misc/qpdfview/qpdfview-qt515-compat.patch deleted file mode 100644 index 1fbf5ec3f101..000000000000 --- a/pkgs/applications/misc/qpdfview/qpdfview-qt515-compat.patch +++ /dev/null @@ -1,17 +0,0 @@ -Fix compatibility with Qt 5.15. - -Patch copied from upstream source repository: - -https://bazaar.launchpad.net/~adamreichold/qpdfview/trunk/revision/2104 - ---- a/sources/model.h 2017-04-19 21:01:25 +0000 -+++ b/sources/model.h 2020-06-09 06:24:11 +0000 -@@ -24,6 +24,7 @@ - #define DOCUMENTMODEL_H - - #include -+#include - #include - #include - #include - diff --git a/pkgs/applications/misc/qpdfview/default.nix b/pkgs/applications/office/qpdfview/default.nix similarity index 77% rename from pkgs/applications/misc/qpdfview/default.nix rename to pkgs/applications/office/qpdfview/default.nix index db5995149c08..6cc26c95a05b 100644 --- a/pkgs/applications/misc/qpdfview/default.nix +++ b/pkgs/applications/office/qpdfview/default.nix @@ -12,19 +12,21 @@ , file , ghostscript }: + mkDerivation rec { pname = "qpdfview"; - version = "0.4.18"; + version = "0.5.0"; src = fetchurl { - url = "https://launchpad.net/qpdfview/trunk/${version}/+download/qpdfview-${version}.tar.gz"; - sha256 = "0v1rl126hvblajnph2hkansgi0s8vjdc5yxrm4y3faa0lxzjwr6c"; + url = "https://launchpad.net/qpdfview/trunk/${version}/+download/qpdfview-0.5.tar.gz"; + hash = "sha256-RO/EQKRhy911eps5bxRh7novQ2ToHfVb0CIfkQIZvpk="; }; - # apply upstream fix for qt5.15 https://bazaar.launchpad.net/~adamreichold/qpdfview/trunk/revision/2104 - patches = [ ./qpdfview-qt515-compat.patch ]; + nativeBuildInputs = [ + qmake + pkg-config + ]; - nativeBuildInputs = [ qmake pkg-config ]; buildInputs = [ qtbase qtsvg @@ -35,6 +37,7 @@ mkDerivation rec { file ghostscript ]; + preConfigure = '' qmakeFlags+=(*.pro) ''; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index e1f2cec22ee8..918be082e114 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -33416,7 +33416,7 @@ with pkgs; inherit (darwin.apple_sdk.frameworks) Foundation; }; - qpdfview = libsForQt5.callPackage ../applications/misc/qpdfview {}; + qpdfview = libsForQt5.callPackage ../applications/office/qpdfview {}; qtile = callPackage ../applications/window-managers/qtile { };