diff options
author | Thomas Tuegel <ttuegel@gmail.com> | 2015-04-02 09:50:37 -0500 |
---|---|---|
committer | Thomas Tuegel <ttuegel@gmail.com> | 2015-04-02 09:51:44 -0500 |
commit | c0d5cd0ff90cac2e04f6b436991baa4c4471150f (patch) | |
tree | 10a4782e57c637d12db8f59c079117e1b2c56ab2 /pkgs/applications/editors/texstudio | |
parent | da74e8c317519059b62383a90f48d5403863038d (diff) | |
download | nixpkgs-c0d5cd0ff90cac2e04f6b436991baa4c4471150f.tar nixpkgs-c0d5cd0ff90cac2e04f6b436991baa4c4471150f.tar.gz nixpkgs-c0d5cd0ff90cac2e04f6b436991baa4c4471150f.tar.bz2 nixpkgs-c0d5cd0ff90cac2e04f6b436991baa4c4471150f.tar.lz nixpkgs-c0d5cd0ff90cac2e04f6b436991baa4c4471150f.tar.xz nixpkgs-c0d5cd0ff90cac2e04f6b436991baa4c4471150f.tar.zst nixpkgs-c0d5cd0ff90cac2e04f6b436991baa4c4471150f.zip |
poppler: fix build of Qt 4 and Qt 5 wrappers
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.
Diffstat (limited to 'pkgs/applications/editors/texstudio')
-rw-r--r-- | pkgs/applications/editors/texstudio/default.nix | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/pkgs/applications/editors/texstudio/default.nix b/pkgs/applications/editors/texstudio/default.nix index cd7f0b78c23..5cb31af797d 100644 --- a/pkgs/applications/editors/texstudio/default.nix +++ b/pkgs/applications/editors/texstudio/default.nix @@ -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 ''; |