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

2016-05-30 19:39:34 +00:00
parent 365379857f 2661511cdb
commit 2d382f3d98
711 changed files with 49079 additions and 11672 deletions
@@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
     echo "patching makefiles..."
     for i in Makefile src/Makefile server/Makefile
     do
-       sed -i "$i" -e "s|/usr/X11R6|${libX11}|g ; s|-lICE|-lX11 -lICE|g"
+       sed -i "$i" -e "s|/usr/X11R6|${libX11.dev}|g ; s|-lICE|-lX11 -lICE|g"
     done '';

  buildPhase = ''