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

treewide: Make explicit that 'dev' output of poppler_qt4 is used

Browse Source
This commit is contained in:
Tuomas Tynkkynen 2016-04-16 20:45:41 +03:00 committed by Vladimír Čunát
parent ebf6b3cd51
commit a030794d06
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pkgs/applications/misc/diffpdf/default.nix
View File

@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [ qmake4Hook ]; nativeBuildInputs = [ qmake4Hook ];
preConfigure = '' preConfigure = ''
substituteInPlace diffpdf.pro --replace @@NIX_POPPLER_QT4@@ ${poppler_qt4} substituteInPlace diffpdf.pro --replace @@NIX_POPPLER_QT4@@ ${poppler_qt4.dev}
lrelease diffpdf.pro lrelease diffpdf.pro
''; '';

4
pkgs/top-level/python-packages.nix
View File

@ -7380,9 +7380,9 @@ in modules // {
propagatedBuildInputs = [ pkgs.pyqt4 pkgs.pkgconfig pkgs.poppler_qt4 ]; propagatedBuildInputs = [ pkgs.pyqt4 pkgs.pkgconfig pkgs.poppler_qt4 ];
preBuild = "${python}/bin/${python.executable} setup.py build_ext" + 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 = { meta = {
description = "A Python binding to Poppler-Qt4"; description = "A Python binding to Poppler-Qt4";