colin/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #37986 from jtojnar/qpdfview-qt5

Browse Source 
qpdfview: port to qt5
This commit is contained in:
Jan Tojnar 2018-04-30 02:43:06 +02:00 committed by GitHub
commit 205d9a720f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 9 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
pkgs/applications/misc/qpdfview/default.nix
View File

@ -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";

2
pkgs/top-level/all-packages.nix
View File

@ -18224,7 +18224,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;