Merge branch 'master' into staging-next

2019-09-04 11:00:56 +02:00
parent 2c5835b09a 1d8a3973f4
commit 4aad2947f8
217 changed files with 7332 additions and 2071 deletions
@@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
  };

  makeFlags = [
-    "PREFIX=${placeholder ''out''}"
+    "PREFIX=${placeholder "out"}"
  ];

  installTargets = [