diff options
| author | Tuomas Tynkkynen <tuomas@tuxera.com> | 2016-04-16 20:45:41 +0300 |
|---|---|---|
| committer | Vladimír Čunát <vcunat@gmail.com> | 2016-05-19 10:02:29 +0200 |
| commit | a030794d06be34841d533c18150ecc3a833a53f0 (patch) | |
| tree | ea3c005a664235b91734d26b6955b8e3ff445fdd | |
| parent | ebf6b3cd51f4fd95d9effe2ae60a54549337f165 (diff) | |
| download | nixlib-a030794d06be34841d533c18150ecc3a833a53f0.tar nixlib-a030794d06be34841d533c18150ecc3a833a53f0.tar.gz nixlib-a030794d06be34841d533c18150ecc3a833a53f0.tar.bz2 nixlib-a030794d06be34841d533c18150ecc3a833a53f0.tar.lz nixlib-a030794d06be34841d533c18150ecc3a833a53f0.tar.xz nixlib-a030794d06be34841d533c18150ecc3a833a53f0.tar.zst nixlib-a030794d06be34841d533c18150ecc3a833a53f0.zip | |
treewide: Make explicit that 'dev' output of poppler_qt4 is used
| -rw-r--r-- | pkgs/applications/misc/diffpdf/default.nix | 2 | ||||
| -rw-r--r-- | pkgs/top-level/python-packages.nix | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/pkgs/applications/misc/diffpdf/default.nix b/pkgs/applications/misc/diffpdf/default.nix index 666c3a40cdcc..fd3d0b35729e 100644 --- a/pkgs/applications/misc/diffpdf/default.nix +++ b/pkgs/applications/misc/diffpdf/default.nix @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ qmake4Hook ]; preConfigure = '' - substituteInPlace diffpdf.pro --replace @@NIX_POPPLER_QT4@@ ${poppler_qt4} + substituteInPlace diffpdf.pro --replace @@NIX_POPPLER_QT4@@ ${poppler_qt4.dev} lrelease diffpdf.pro ''; diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index a9fd1a508451..573ad60d286c 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -7380,9 +7380,9 @@ in modules // { propagatedBuildInputs = [ pkgs.pyqt4 pkgs.pkgconfig pkgs.poppler_qt4 ]; preBuild = "${python}/bin/${python.executable} setup.py build_ext" + - " --include-dirs=${pkgs.poppler_qt4}/include/poppler/"; + " --include-dirs=${pkgs.poppler_qt4.dev}/include/poppler/"; - NIX_CFLAGS_COMPILE = "-I${pkgs.poppler_qt4}/include/poppler/"; + NIX_CFLAGS_COMPILE = "-I${pkgs.poppler_qt4.dev}/include/poppler/"; meta = { description = "A Python binding to Poppler-Qt4"; |