3
0
Fork 0
forked from mirrors/nixpkgs

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

This commit is contained in:
Tuomas Tynkkynen 2016-04-16 20:45:33 +03:00 committed by Vladimír Čunát
parent d42e94472d
commit ebf6b3cd51
2 changed files with 2 additions and 2 deletions

View file

@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
buildInputs = [ qt4 poppler_qt4 zlib ];
nativeBuildInputs = [ pkgconfig poppler qmake4Hook ];
NIX_CFLAGS_COMPILE="-I${poppler}/include/poppler";
NIX_CFLAGS_COMPILE="-I${poppler.dev}/include/poppler";
preConfigure = ''
qmakeFlags="$qmakeFlags DESKTOPDIR=$out/share/applications ICONDIR=$out/share/pixmaps"

View file

@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
};
preConfigure = ''
export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -I${poppler}/include/poppler"
export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -I${poppler.dev}/include/poppler"
'';
buildInputs = [