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

poppler: fix build of Qt 4 and Qt 5 wrappers

Browse Source 
The autoconf build system for poppler does not support building the
wrappers separately, so this slightly enlarges the size of closures. To
compensate, the command-line utilities have been separated into their
own package.
This commit is contained in:
Thomas Tuegel
2015-04-02 09:51:44 -05:00
parent da74e8c317
commit c0d5cd0ff9
13 changed files with 63 additions and 99 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkgs/applications/editors/texstudio/default.nix
+3 -3
View File
@@ -1,4 +1,4 @@
{ stdenv, fetchurl, qt4, popplerQt4, zlib}:
{ stdenv, fetchurl, qt4, poppler_qt4, zlib}:
stdenv.mkDerivation rec {
pname = "texstudio";
@@ -11,10 +11,10 @@ stdenv.mkDerivation rec {
sha256 = "167d78nfk265jjvl129nr70v8ladb2rav2qyhw7ngr6m54gak831";
};
buildInputs = [ qt4 popplerQt4 zlib ];
buildInputs = [ qt4 poppler_qt4 zlib ];
preConfigure = ''
export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -I$(echo ${popplerQt4}/include/poppler/qt4) "
export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -I$(echo ${poppler_qt4}/include/poppler/qt4) "
qmake PREFIX=$out texstudio.pro
'';