Merge pull request #244403 from Artturin/fixadapter3

Artturi f5c8c3c4 7c70396c

Changed files
+1 -4
pkgs
stdenv
+1 -4
pkgs/stdenv/adapters.nix
···
"--disable-shared" # brrr...
];
}));
-
} // lib.optionalAttrs (stdenv0.hostPlatform.libc == "libc") {
+
} // lib.optionalAttrs (stdenv0.hostPlatform.libc == "glibc") {
extraBuildInputs = (old.extraBuildInputs or []) ++ [
pkgs.glibc.static
];
···
# Apple does not provide a static version of libSystem or crt0.o
# So we can’t build static binaries without extensive hacks.
++ lib.optional (!stdenv.hostPlatform.isDarwin) makeStaticBinaries
-
-
# Glibc doesn’t come with static runtimes by default.
-
# ++ lib.optional (stdenv.hostPlatform.libc == "glibc") ((lib.flip overrideInStdenv) [ self.glibc.static ])
);