mirror of
https://github.com/SebastianWendel/nixpkgs.git
synced 2024-10-01 17:40:20 +02:00
f110a182a6
The old stdenv adapters were subtly wrong in two ways:
- `overrideAttrs` leaked the original, unoverridden `mkDerivation`.
- `stdenv.override` would throw away any manually-set `mkDerivation`
from a stdenv reverting to the original.
Now, `mkDerivation` is controlled (nearly directly) via an argument, and
always correctly closes over the final ("self") stdenv. This means the
adapters can work entirely via `.override` without any manual `stdenv //
...`, and both those issues are fixed.
Note hashes are changed, because stdenvs no previously overridden like
`stdenvNoCC` and `crossLibcStdenv` now are. I had to add some
`dontDisableStatic = true` accordingly. The flip side however is that
since the overrides compose, we no longer need to override anything but
the default `stdenv` from which all the others are created.
112 lines
3.8 KiB
Nix
112 lines
3.8 KiB
Nix
# Overlay that builds static packages.
|
||
|
||
# Not all packages will build but support is done on a
|
||
# best effort basic.
|
||
#
|
||
# Note on Darwin/macOS: Apple does not provide a static libc
|
||
# so any attempts at static binaries are going to be very
|
||
# unsupported.
|
||
#
|
||
# Basic things like pkgsStatic.hello should work out of the box. More
|
||
# complicated things will need to be fixed with overrides.
|
||
|
||
self: super: let
|
||
inherit (super.stdenvAdapters) makeStaticBinaries
|
||
makeStaticLibraries
|
||
propagateBuildInputs;
|
||
inherit (super.lib) foldl optional flip id composeExtensions optionalAttrs optionalString;
|
||
inherit (super) makeSetupHook;
|
||
|
||
# Best effort static binaries. Will still be linked to libSystem,
|
||
# but more portable than Nix store binaries.
|
||
makeStaticDarwin = stdenv_: let stdenv = stdenv_.override {
|
||
# extraBuildInputs are dropped in cross.nix, but darwin still needs them
|
||
extraBuildInputs = [ self.buildPackages.darwin.CF ];
|
||
}; in stdenv // {
|
||
mkDerivation = args: stdenv.mkDerivation (args // {
|
||
NIX_CFLAGS_LINK = toString (args.NIX_CFLAGS_LINK or "")
|
||
+ optionalString (stdenv_.cc.isGNU or false) " -static-libgcc";
|
||
nativeBuildInputs = (args.nativeBuildInputs or []) ++ [ (makeSetupHook {
|
||
substitutions = {
|
||
libsystem = "${stdenv.cc.libc}/lib/libSystem.B.dylib";
|
||
};
|
||
} ../stdenv/darwin/portable-libsystem.sh) ];
|
||
});
|
||
};
|
||
|
||
staticAdapters =
|
||
optional super.stdenv.hostPlatform.isDarwin makeStaticDarwin
|
||
|
||
++ [ makeStaticLibraries propagateBuildInputs ]
|
||
|
||
# Apple does not provide a static version of libSystem or crt0.o
|
||
# So we can’t build static binaries without extensive hacks.
|
||
++ optional (!super.stdenv.hostPlatform.isDarwin) makeStaticBinaries
|
||
|
||
# Glibc doesn’t come with static runtimes by default.
|
||
# ++ optional (super.stdenv.hostPlatform.libc == "glibc") ((flip overrideInStdenv) [ self.stdenv.glibc.static ])
|
||
;
|
||
|
||
ocamlFixPackage = b:
|
||
b.overrideAttrs (o: {
|
||
configurePlatforms = [ ];
|
||
dontAddStaticConfigureFlags = true;
|
||
buildInputs = o.buildInputs ++ o.nativeBuildInputs or [ ];
|
||
propagatedNativeBuildInputs = o.propagatedBuildInputs or [ ];
|
||
});
|
||
|
||
ocamlStaticAdapter = _: super:
|
||
self.lib.mapAttrs
|
||
(_: p: if p ? overrideAttrs then ocamlFixPackage p else p)
|
||
super
|
||
// {
|
||
lablgtk = null; # Currently xlibs cause infinite recursion
|
||
ocaml = ((super.ocaml.override { useX11 = false; }).overrideAttrs (o: {
|
||
configurePlatforms = [ ];
|
||
dontUpdateAutotoolsGnuConfigScripts = true;
|
||
})).overrideDerivation (o: {
|
||
preConfigure = ''
|
||
configureFlagsArray+=("-cc" "$CC" "-as" "$AS" "-partialld" "$LD -r")
|
||
'';
|
||
dontAddStaticConfigureFlags = true;
|
||
configureFlags = [
|
||
"--no-shared-libs"
|
||
"-host ${o.stdenv.hostPlatform.config}"
|
||
"-target ${o.stdenv.targetPlatform.config}"
|
||
];
|
||
});
|
||
};
|
||
|
||
in {
|
||
stdenv = foldl (flip id) super.stdenv staticAdapters;
|
||
|
||
boost = super.boost.override {
|
||
# Don’t use new stdenv for boost because it doesn’t like the
|
||
# --disable-shared flag
|
||
stdenv = super.stdenv;
|
||
};
|
||
|
||
curl = super.curl.override {
|
||
# brotli doesn't build static (Mar. 2021)
|
||
brotliSupport = false;
|
||
# disable gss becuase of: undefined reference to `k5_bcmp'
|
||
gssSupport = false;
|
||
};
|
||
|
||
ocaml-ng = self.lib.mapAttrs (_: set:
|
||
if set ? overrideScope' then set.overrideScope' ocamlStaticAdapter else set
|
||
) super.ocaml-ng;
|
||
|
||
perl = super.perl.override {
|
||
# Don’t use new stdenv zlib because
|
||
# it doesn’t like the --disable-shared flag
|
||
stdenv = super.stdenv;
|
||
};
|
||
|
||
zlib = super.zlib.override {
|
||
# Don’t use new stdenv zlib because
|
||
# it doesn’t like the --disable-shared flag
|
||
stdenv = super.stdenv;
|
||
};
|
||
}
|