nordic-dev.net/nixpkgs
nordic-dev.net/nixpkgs
2
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2025-04-12 00:07:17 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #106115 from matthewbauer/static-nix-darwin

Browse Source 
Improve static Nix Darwin support
This commit is contained in:
Matthew Bauer 2020-12-08 15:55:22 -06:00 committed by GitHub
commit 1fb6bb9791
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 10 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
pkgs/top-level/static.nix
View File

@ -34,14 +34,18 @@ self: super: let
}); });
}; };
staticAdapters = [ makeStaticLibraries propagateBuildInputs ] staticAdapters =
# makeStaticDarwin must go first so that the extraBuildInputs
# override does not recreate mkDerivation, removing subsequent
# adapters.
optional super.stdenv.hostPlatform.isDarwin makeStaticDarwin
++ [ makeStaticLibraries propagateBuildInputs ]
# 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.
++ optional (!super.stdenv.hostPlatform.isDarwin) makeStaticBinaries ++ optional (!super.stdenv.hostPlatform.isDarwin) makeStaticBinaries
++ optional super.stdenv.hostPlatform.isDarwin makeStaticDarwin
# Glibc doesn’t come with static runtimes by default. # Glibc doesn’t come with static runtimes by default.
# ++ optional (super.stdenv.hostPlatform.libc == "glibc") ((flip overrideInStdenv) [ self.stdenv.glibc.static ]) # ++ optional (super.stdenv.hostPlatform.libc == "glibc") ((flip overrideInStdenv) [ self.stdenv.glibc.static ])
; ;
@ -163,6 +167,7 @@ in {
}; };
mkl = super.mkl.override { enableStatic = true; }; mkl = super.mkl.override { enableStatic = true; };
nix = super.nix.override { enableStatic = true; }; nix = super.nix.override { enableStatic = true; };
nixUnstable = super.nixUnstable.override { enableStatic = true; };
openssl = (super.openssl_1_1.override { static = true; }).overrideAttrs (o: { openssl = (super.openssl_1_1.override { static = true; }).overrideAttrs (o: {
# OpenSSL doesn't like the `--enable-static` / `--disable-shared` flags. # OpenSSL doesn't like the `--enable-static` / `--disable-shared` flags.
configureFlags = (removeUnknownConfigureFlags o.configureFlags); configureFlags = (removeUnknownConfigureFlags o.configureFlags);
@ -281,8 +286,8 @@ in {
python39 = super.python39.override { static = true; }; python39 = super.python39.override { static = true; };
python3Minimal = super.python3Minimal.override { static = true; }; python3Minimal = super.python3Minimal.override { static = true; };
# Note: -static doesn’t work on darwin
libev = super.libev.override { static = true; }; libev = super.libev.override { static = !super.stdenv.hostPlatform.isDarwin; };
libexecinfo = super.libexecinfo.override { enableShared = false; }; libexecinfo = super.libexecinfo.override { enableShared = false; };