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/desktops/kde-4.14/kdelibs | |
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/desktops/kde-4.14/kdelibs')
-rw-r--r-- | pkgs/desktops/kde-4.14/kdelibs/kfilemetadata.nix | 4 | ||||
-rw-r--r-- | pkgs/desktops/kde-4.14/kdelibs/nepomuk-core.nix | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/pkgs/desktops/kde-4.14/kdelibs/kfilemetadata.nix b/pkgs/desktops/kde-4.14/kdelibs/kfilemetadata.nix index 48f535549ce..6068516ba2b 100644 --- a/pkgs/desktops/kde-4.14/kdelibs/kfilemetadata.nix +++ b/pkgs/desktops/kde-4.14/kdelibs/kfilemetadata.nix @@ -1,8 +1,8 @@ -{ stdenv, kde, kdelibs, pkgconfig, doxygen, popplerQt4, taglib, exiv2, ffmpeg }: +{ stdenv, kde, kdelibs, pkgconfig, doxygen, poppler_qt4, taglib, exiv2, ffmpeg }: kde { buildInputs = [ - kdelibs popplerQt4 taglib exiv2 ffmpeg + kdelibs poppler_qt4 taglib exiv2 ffmpeg ]; nativeBuildInputs = [ pkgconfig doxygen ]; diff --git a/pkgs/desktops/kde-4.14/kdelibs/nepomuk-core.nix b/pkgs/desktops/kde-4.14/kdelibs/nepomuk-core.nix index d90e1455ce9..526ac069e61 100644 --- a/pkgs/desktops/kde-4.14/kdelibs/nepomuk-core.nix +++ b/pkgs/desktops/kde-4.14/kdelibs/nepomuk-core.nix @@ -1,4 +1,4 @@ -{ stdenv, kde, kdelibs, soprano, shared_desktop_ontologies, exiv2, ffmpeg, taglib, popplerQt4 +{ stdenv, kde, kdelibs, soprano, shared_desktop_ontologies, exiv2, ffmpeg, taglib, poppler_qt4 , pkgconfig, doxygen, ebook_tools }: @@ -8,7 +8,7 @@ kde { buildInputs = [ kdelibs soprano shared_desktop_ontologies taglib exiv2 ffmpeg - popplerQt4 ebook_tools + poppler_qt4 ebook_tools ]; nativeBuildInputs = [ pkgconfig doxygen ]; |