Merge staging-next into staging

2022-05-26 00:02:58 +00:00
parent f9efb46ae1 ec51248b83
commit f82caaee74
82 changed files with 1224 additions and 755 deletions
@@ -288,7 +288,7 @@ in with passthru; stdenv.mkDerivation {
  CPPFLAGS = concatStringsSep " " (map (p: "-I${getDev p}/include") buildInputs);
  LDFLAGS = concatStringsSep " " (map (p: "-L${getLib p}/lib") buildInputs);
  LIBS = "${optionalString (!stdenv.isDarwin) "-lcrypt"}";
-  NIX_LDFLAGS = lib.optionalString stdenv.cc.isGNU ({
+  NIX_LDFLAGS = lib.optionalString (stdenv.cc.isGNU && !stdenv.hostPlatform.isStatic) ({
    "glibc" = "-lgcc_s";
    "musl" = "-lgcc_eh";
  }."${stdenv.hostPlatform.libc}" or "");