Merge remote-tracking branch 'upstream/master' into hardened-stdenv

This commit is contained in:
Robin Gloster
2016-04-18 13:00:40 +00:00
1369 changed files with 35810 additions and 10571 deletions

View File

@@ -18,8 +18,8 @@ stdenv.mkDerivation {
preBuild = ''
cp Makefile.linux Makefile
sed -i 's|/usr/include/libxml2|${libxml2}/include/libxml2|' Makefile
sed -i 's|-lxml2|-lxml2 -L${libxml2}/lib|' Makefile
sed -i 's|/usr/include/libxml2|${libxml2.dev}/include/libxml2|' Makefile
sed -i 's|-lxml2|-lxml2 -L${libxml2.out}/lib|' Makefile
sed -i 's|XPDF = xpdf_3.01|XPDF = ${libxpdf}/lib|' Makefile
mkdir exe