Merge staging-next into staging

2021-02-17 00:36:34 +00:00
parent c0f4dcb71d 79b7a67b55
commit 3e0ef2752a
60 changed files with 2031 additions and 1320 deletions
@@ -118,9 +118,11 @@ stdenv.mkDerivation rec {
    logger() { '$out'/bin/logger "$@"; }\
    ' ${debianDispatcherScript} > ${outDispatchPath}
    chmod 555 ${outDispatchPath}
-    PATH=$out/bin patchShebangs ${outDispatchPath}
+    HOST_PATH=$out/bin patchShebangs --host ${outDispatchPath}
  '';

+  strictDeps = true;
+
  depsBuildBuild = [ buildPackages.stdenv.cc ];

  buildInputs = lib.optionals (enableStatic && !useMusl && stdenv.cc.libc ? static) [ stdenv.cc.libc stdenv.cc.libc.static ];