Merge branch 'master' into staging

Mass rebuilds from master (>7k on x86_64-linux).
2017-06-30 18:16:58 +02:00
parent c53449ce57 f0c3e5f519
commit ddf864f8aa
204 changed files with 4669 additions and 3203 deletions
@@ -11,6 +11,7 @@ stdenv.mkDerivation rec {

  postPatch = ''
    substituteInPlace Makefile --replace /usr $out
+    sed -i -e '/chmod u+s/d' Makefile
  '';

  meta = with stdenv.lib; {