diff options
| author | Jan Tojnar <jtojnar@gmail.com> | 2018-04-30 02:43:06 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-04-30 02:43:06 +0200 |
| commit | 205d9a720f2254d29d782b7ebd6c9c4e20f9b3ed (patch) | |
| tree | 1061d8362fb355b2037468001eb462af24c738b2 /pkgs/applications | |
| parent | 47a738339553e5416e9edb4c5bc71c3497911fb1 (diff) | |
| parent | 9e503e039b6adce89bc0b99cbf6e5b24d3b75118 (diff) | |
| download | nixlib-205d9a720f2254d29d782b7ebd6c9c4e20f9b3ed.tar nixlib-205d9a720f2254d29d782b7ebd6c9c4e20f9b3ed.tar.gz nixlib-205d9a720f2254d29d782b7ebd6c9c4e20f9b3ed.tar.bz2 nixlib-205d9a720f2254d29d782b7ebd6c9c4e20f9b3ed.tar.lz nixlib-205d9a720f2254d29d782b7ebd6c9c4e20f9b3ed.tar.xz nixlib-205d9a720f2254d29d782b7ebd6c9c4e20f9b3ed.tar.zst nixlib-205d9a720f2254d29d782b7ebd6c9c4e20f9b3ed.zip | |
Merge pull request #37986 from jtojnar/qpdfview-qt5
qpdfview: port to qt5
Diffstat (limited to 'pkgs/applications')
| -rw-r--r-- | pkgs/applications/misc/qpdfview/default.nix | 17 |
1 files changed, 8 insertions, 9 deletions
diff --git a/pkgs/applications/misc/qpdfview/default.nix b/pkgs/applications/misc/qpdfview/default.nix index e3e7ff950b0c..f836ce5b8085 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,12 @@ 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* + + # 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; description = "A tabbed document viewer"; |