Merge branch 'master' into staging-next

2020-04-16 10:09:43 +02:00
parent a04625379a 342eaba9eb
commit 3d8e436917
277 changed files with 8102 additions and 4662 deletions
@@ -75,7 +75,7 @@ stdenv.mkDerivation rec {

  enableParallelBuilding = true;

-  stripDebugList = "lib modules bin";
+  stripDebugList = [ "lib" "modules" "bin" ];

  postInstall = ''
    mkdir -p $doc/share/doc/httpd