public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #51966 from Twey/automatic-static-glibc

Browse Source 
makeStaticBinaries: add a static glibc when performing a mkDerivation
This commit is contained in:
Matthew Bauer 2018-12-14 19:03:37 -06:00 committed by GitHub
commit ca00533887
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 11 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
pkgs/stdenv/adapters.nix
View File

@ -31,11 +31,18 @@ rec {
# Return a modified stdenv that tries to build statically linked # Return a modified stdenv that tries to build statically linked
# binaries. # binaries.
makeStaticBinaries = stdenv: stdenv // makeStaticBinaries = stdenv:
let stdenv' = if stdenv.hostPlatform.libc != "glibc" then stdenv else
stdenv.override (prev: {
extraBuildInputs = prev.extraBuildInputs or [] ++ [
stdenv.glibc.static
];
});
in stdenv' //
{ mkDerivation = args: { mkDerivation = args:
if stdenv.hostPlatform.isDarwin if stdenv'.hostPlatform.isDarwin
then throw "Cannot build fully static binaries on Darwin/macOS" then throw "Cannot build fully static binaries on Darwin/macOS"
else stdenv.mkDerivation (args // { else stdenv'.mkDerivation (args // {
NIX_CFLAGS_LINK = toString (args.NIX_CFLAGS_LINK or "") + " -static"; NIX_CFLAGS_LINK = toString (args.NIX_CFLAGS_LINK or "") + " -static";
configureFlags = (args.configureFlags or []) ++ [ configureFlags = (args.configureFlags or []) ++ [
"--disable-shared" # brrr... "--disable-shared" # brrr...