Merge master into staging-next

2020-06-24 19:04:03 +02:00
parent 7481da9cbd 0c47a81419
commit 16287a8cb8
154 changed files with 1609 additions and 808 deletions
@@ -21,6 +21,7 @@ stdenv.mkDerivation rec {

  postPatch = ''
    substituteInPlace Makefile --replace 'fc-cache' '#fc-cache'
+    substituteInPlace Makefile --replace 'gzip'     'gzip -n'
  '';

  postBuild = ''