Merge pull request #37986 from jtojnar/qpdfview-qt5
qpdfview: port to qt5
This commit is contained in:
commit
205d9a720f
@ -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
|
, file, ghostscript
|
||||||
}:
|
}:
|
||||||
let
|
let
|
||||||
@ -10,9 +10,9 @@ let
|
|||||||
url="https://launchpad.net/qpdfview/trunk/${version}/+download/qpdfview-${version}.tar.gz";
|
url="https://launchpad.net/qpdfview/trunk/${version}/+download/qpdfview-${version}.tar.gz";
|
||||||
sha256 = "0zysjhr58nnmx7ba01q3zvgidkgcqxjdj4ld3gx5fc7wzvl1dm7s";
|
sha256 = "0zysjhr58nnmx7ba01q3zvgidkgcqxjdj4ld3gx5fc7wzvl1dm7s";
|
||||||
};
|
};
|
||||||
nativeBuildInputs = [ pkgconfig ];
|
nativeBuildInputs = [ qmake pkgconfig ];
|
||||||
buildInputs = [
|
buildInputs = [
|
||||||
qt4 poppler_qt4 djvulibre libspectre cups file ghostscript
|
qtbase qtsvg poppler_qt5 djvulibre libspectre cups file ghostscript
|
||||||
];
|
];
|
||||||
in
|
in
|
||||||
stdenv.mkDerivation {
|
stdenv.mkDerivation {
|
||||||
@ -21,13 +21,12 @@ stdenv.mkDerivation {
|
|||||||
src = fetchurl {
|
src = fetchurl {
|
||||||
inherit (s) url sha256;
|
inherit (s) url sha256;
|
||||||
};
|
};
|
||||||
configurePhase = ''
|
|
||||||
qmake *.pro
|
# TODO: revert this once placeholder is supported
|
||||||
for i in *.pro; do
|
preConfigure = ''
|
||||||
qmake "$i" -o "Makefile.$(basename "$i" .pro)"
|
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"
|
||||||
done
|
|
||||||
sed -e "s@/usr/@$out/@g" -i Makefile*
|
|
||||||
'';
|
'';
|
||||||
|
|
||||||
meta = {
|
meta = {
|
||||||
inherit (s) version;
|
inherit (s) version;
|
||||||
description = "A tabbed document viewer";
|
description = "A tabbed document viewer";
|
||||||
|
@ -18224,7 +18224,7 @@ with pkgs;
|
|||||||
|
|
||||||
vimNox = lowPrio (vim_configurable.override { source = "vim-nox"; });
|
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 {
|
qtile = callPackage ../applications/window-managers/qtile {
|
||||||
inherit (xorg) libxcb;
|
inherit (xorg) libxcb;
|
||||||
|
Loading…
Reference in New Issue
Block a user