From a030794d06be34841d533c18150ecc3a833a53f0 Mon Sep 17 00:00:00 2001 From: Tuomas Tynkkynen Date: Sat, 16 Apr 2016 20:45:41 +0300 Subject: treewide: Make explicit that 'dev' output of poppler_qt4 is used --- pkgs/applications/misc/diffpdf/default.nix | 2 +- 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"; -- cgit 1.4.1