Merge remote-tracking branch 'origin/staging'

2016-03-27 13:19:04 +01:00
parent d88ae1045d dae3a7b721
commit b07e7bfc7b
106 changed files with 1065 additions and 3988 deletions
@@ -38,7 +38,7 @@ stdenv.mkDerivation rec {
    touch lib/standardppmdfont.c
  '';

-  enableParallelBuilding = true;
+  enableParallelBuilding = false;

  installPhase = ''
    make package pkgdir=$out