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

popplerQt: build with Qt 5.5

Browse Source
This commit is contained in:
Thomas Tuegel 2015-09-27 09:59:32 -05:00
parent e2c25b2f60
commit 60000c87ae
2 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
pkgs/development/libraries/poppler/default.nix
View File

@ -1,6 +1,6 @@
{ stdenv, lib, fetchurl, fetchpatch, pkgconfig, libiconv, libintlOrEmpty { stdenv, lib, fetchurl, fetchpatch, pkgconfig, libiconv, libintlOrEmpty
, zlib, curl, cairo, freetype, fontconfig, lcms, libjpeg, openjpeg , zlib, curl, cairo, freetype, fontconfig, lcms, libjpeg, openjpeg
, minimal ? false, qt4Support ? false, qt4 ? null, qt5Support ? false, qt5 ? null , minimal ? false, qt4Support ? false, qt4 ? null, qt5Support ? false, qtbase ? null
, utils ? false, suffix ? "glib" , utils ? false, suffix ? "glib"
}: }:
@ -25,7 +25,7 @@ stdenv.mkDerivation rec {
[ zlib freetype fontconfig libjpeg lcms curl openjpeg ] [ zlib freetype fontconfig libjpeg lcms curl openjpeg ]
++ optional (!minimal) cairo ++ optional (!minimal) cairo
++ optional qt4Support qt4 ++ optional qt4Support qt4
++ optional qt5Support qt5.base; ++ optional qt5Support qtbase;
nativeBuildInputs = [ pkgconfig libiconv ] ++ libintlOrEmpty; nativeBuildInputs = [ pkgconfig libiconv ] ++ libintlOrEmpty;

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

@ -7819,10 +7819,7 @@ let
suffix = "qt4"; suffix = "qt4";
}; };
poppler_qt5 = poppler.override { poppler_qt5 = qt5Libs.popplerQt;
qt5Support = true;
suffix = "qt5";
};
poppler_utils = poppler.override { suffix = "utils"; utils = true; }; poppler_utils = poppler.override { suffix = "utils"; utils = true; };
@ -7911,6 +7908,12 @@ let
withQt5 = true; withQt5 = true;
}; };
popplerQt = callPackage ../development/libraries/poppler {
lcms = lcms2;
qt5Support = true;
suffix = "qt5";
};
}; };
qt55Libs = lib.makeScope qt55.newScope qt5LibsFun; qt55Libs = lib.makeScope qt55.newScope qt5LibsFun;