nordic-dev.net/nixpkgs
nordic-dev.net/nixpkgs
2
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-11-24 07:53:19 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #244403 from Artturin/fixadapter3

Browse Source
This commit is contained in:
Artturi 2023-07-21 21:04:12 +03:00 committed by GitHub
commit f5c8c3c410
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 1 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
pkgs/stdenv/adapters.nix
View File

@ -67,7 +67,7 @@ rec {
"--disable-shared" # brrr... "--disable-shared" # brrr...
]; ];
})); }));
} // lib.optionalAttrs (stdenv0.hostPlatform.libc == "libc") { } // lib.optionalAttrs (stdenv0.hostPlatform.libc == "glibc") {
extraBuildInputs = (old.extraBuildInputs or []) ++ [ extraBuildInputs = (old.extraBuildInputs or []) ++ [
pkgs.glibc.static pkgs.glibc.static
]; ];
@ -121,9 +121,6 @@ rec {
# Apple does not provide a static version of libSystem or crt0.o # Apple does not provide a static version of libSystem or crt0.o
# So we can’t build static binaries without extensive hacks. # So we can’t build static binaries without extensive hacks.
++ lib.optional (!stdenv.hostPlatform.isDarwin) makeStaticBinaries ++ 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 ])
); );