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
@@ -23,7 +23,7 @@ stdenv.mkDerivation rec {
  '';

  makeFlags = [
-    "PREFIX=${placeholder ''out''}"
+    "PREFIX=${placeholder "out"}"
    "ENABLE_MAN=yes"
    "DOCBOOK_XSL=${docbook_xsl}/share/xml/docbook-xsl-nons/manpages/docbook.xsl"
  ];
@@ -21,9 +21,9 @@ stdenv.mkDerivation rec {
  ];

  makeFlags = [
-    "PREFIX=${placeholder ''out''}"
-    "INSTALL_LIB=${placeholder ''out''}/bin"
-    "INSTALL_MAN=${placeholder ''out''}/share/man/man1"
+    "PREFIX=${placeholder "out"}"
+    "INSTALL_LIB=${placeholder "out"}/bin"
+    "INSTALL_MAN=${placeholder "out"}/share/man/man1"
  ];

  patches = [