From 62eb285a621e1b09ea82387c15a817cf07d61d9e Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Wed, 28 Mar 2018 12:48:31 +0200 Subject: [PATCH 1/2] qpdfview: port to qt5 --- pkgs/applications/misc/qpdfview/default.nix | 24 ++++++++++++--------- pkgs/top-level/all-packages.nix | 2 +- 2 files changed, 15 insertions(+), 11 deletions(-) diff --git a/pkgs/applications/misc/qpdfview/default.nix b/pkgs/applications/misc/qpdfview/default.nix index e3e7ff950b0..a4fd1d35674 100644 --- a/pkgs/applications/misc/qpdfview/default.nix +++ b/pkgs/applications/misc/qpdfview/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl, qt4, pkgconfig, poppler_qt4, djvulibre, libspectre, cups +{stdenv, fetchurl, qmake, qtbase, qtsvg, pkgconfig, poppler_qt5, djvulibre, libspectre, cups , file, ghostscript }: let @@ -10,9 +10,9 @@ let url="https://launchpad.net/qpdfview/trunk/${version}/+download/qpdfview-${version}.tar.gz"; sha256 = "0zysjhr58nnmx7ba01q3zvgidkgcqxjdj4ld3gx5fc7wzvl1dm7s"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ qmake pkgconfig ]; buildInputs = [ - qt4 poppler_qt4 djvulibre libspectre cups file ghostscript + qtbase qtsvg poppler_qt5 djvulibre libspectre cups file ghostscript ]; in stdenv.mkDerivation { @@ -21,13 +21,17 @@ stdenv.mkDerivation { src = fetchurl { inherit (s) url sha256; }; - configurePhase = '' - qmake *.pro - for i in *.pro; do - qmake "$i" -o "Makefile.$(basename "$i" .pro)" - done - sed -e "s@/usr/@$out/@g" -i Makefile* - ''; + qmakeFlags = [ + "*.pro" + "TARGET_INSTALL_PATH=${placeholder "out"}/bin" + "PLUGIN_INSTALL_PATH=${placeholder "out"}/lib/qpdfview" + "DATA_INSTALL_PATH=${placeholder "out"}/share/qpdfview" + "MANUAL_INSTALL_PATH=${placeholder "out"}/share/man/man1" + "ICON_INSTALL_PATH=${placeholder "out"}/share/icons/hicolor/scalable/apps" + "LAUNCHER_INSTALL_PATH=${placeholder "out"}/share/applications" + "APPDATA_INSTALL_PATH=${placeholder "out"}/share/appdata" + ]; + meta = { inherit (s) version; description = "A tabbed document viewer"; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index c9bbbbf396c..34e13559c64 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -18213,7 +18213,7 @@ with pkgs; vimNox = lowPrio (vim_configurable.override { source = "vim-nox"; }); - qpdfview = callPackage ../applications/misc/qpdfview {}; + qpdfview = libsForQt5.callPackage ../applications/misc/qpdfview {}; qtile = callPackage ../applications/window-managers/qtile { inherit (xorg) libxcb; From 9e503e039b6adce89bc0b99cbf6e5b24d3b75118 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Mon, 30 Apr 2018 02:22:54 +0200 Subject: [PATCH 2/2] qpdfview: remove placeholder usage --- pkgs/applications/misc/qpdfview/default.nix | 15 +++++---------- 1 file changed, 5 insertions(+), 10 deletions(-) diff --git a/pkgs/applications/misc/qpdfview/default.nix b/pkgs/applications/misc/qpdfview/default.nix index a4fd1d35674..f836ce5b808 100644 --- a/pkgs/applications/misc/qpdfview/default.nix +++ b/pkgs/applications/misc/qpdfview/default.nix @@ -21,16 +21,11 @@ stdenv.mkDerivation { src = fetchurl { inherit (s) url sha256; }; - qmakeFlags = [ - "*.pro" - "TARGET_INSTALL_PATH=${placeholder "out"}/bin" - "PLUGIN_INSTALL_PATH=${placeholder "out"}/lib/qpdfview" - "DATA_INSTALL_PATH=${placeholder "out"}/share/qpdfview" - "MANUAL_INSTALL_PATH=${placeholder "out"}/share/man/man1" - "ICON_INSTALL_PATH=${placeholder "out"}/share/icons/hicolor/scalable/apps" - "LAUNCHER_INSTALL_PATH=${placeholder "out"}/share/applications" - "APPDATA_INSTALL_PATH=${placeholder "out"}/share/appdata" - ]; + + # TODO: revert this once placeholder is supported + preConfigure = '' + qmakeFlags="$qmakeFlags *.pro TARGET_INSTALL_PATH=$out/bin PLUGIN_INSTALL_PATH=$out/lib/qpdfview DATA_INSTALL_PATH=$out/share/qpdfview MANUAL_INSTALL_PATH=$out/share/man/man1 ICON_INSTALL_PATH=$out/share/icons/hicolor/scalable/apps LAUNCHER_INSTALL_PATH=$out/share/applications APPDATA_INSTALL_PATH=$out/share/appdata" + ''; meta = { inherit (s) version;