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

2016-03-15 01:44:24 +00:00
parent a9b942c061 d227d9a70e
commit 3f45f0948d
550 changed files with 9204 additions and 3225 deletions
@@ -9,6 +9,10 @@ stdenv.mkDerivation rec {
    sha256 = "0qw77gvr57azjbn76cjlm4sv1hf2hh90g7n7n33gfvlpnbs7mf3p";
  };

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