Merge branch 'master' into closure-size

Beware that stdenv doesn't build. It seems something more will be needed than just resolution of merge conflicts.
2016-04-01 10:06:01 +02:00
parent c643ccaa8c a26357eefe
commit ab15a62c68
1108 changed files with 76254 additions and 11297 deletions
@@ -9,6 +9,10 @@ stdenv.mkDerivation rec {
    sha256 = "0qw77gvr57azjbn76cjlm4sv1hf2hh90g7n7n33gfvlpnbs7mf3p";
  };

+  postPatch = ''
+    sed 's/^CXX=g++/#CXX/' -i makefile
+  '';
+
  buildPhase = ''
    make unrar
    make clean