diff options
| author | John Ericson <John.Ericson@Obsidian.Systems> | 2021-05-04 00:08:20 -0400 |
|---|---|---|
| committer | John Ericson <John.Ericson@Obsidian.Systems> | 2021-05-06 11:17:26 -0400 |
| commit | 470640e7fe53ab57396cff6698125f5bf137b4de (patch) | |
| tree | 997d59f58f7def8d04cdafbe5e30e6e59881bb81 /pkgs/top-level/static.nix | |
| parent | b418e17a4ccf42b1a99aa6eca2b86a5b552d081a (diff) | |
| download | nixpkgs-470640e7fe53ab57396cff6698125f5bf137b4de.tar nixpkgs-470640e7fe53ab57396cff6698125f5bf137b4de.tar.gz nixpkgs-470640e7fe53ab57396cff6698125f5bf137b4de.tar.bz2 nixpkgs-470640e7fe53ab57396cff6698125f5bf137b4de.tar.lz nixpkgs-470640e7fe53ab57396cff6698125f5bf137b4de.tar.xz nixpkgs-470640e7fe53ab57396cff6698125f5bf137b4de.tar.zst nixpkgs-470640e7fe53ab57396cff6698125f5bf137b4de.zip | |
treewide: Do a number of no-op cleanups for cross and darwin
I am taking the non-invasive parts of #110914 to hopefully help out with #111988. In particular: - Use `lib.makeScopeWithSplicing` to make the `darwin` package set have a proper `callPackage`. - Adjust Darwin `stdenv`'s overlays keeping things from the previous stage to not stick around too much. - Expose `binutilsNoLibc` / `darwin.binutilsNoLibc` to hopefully get us closer to a unified LLVM and GCC bootstrap.
Diffstat (limited to 'pkgs/top-level/static.nix')
| -rw-r--r-- | pkgs/top-level/static.nix | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/pkgs/top-level/static.nix b/pkgs/top-level/static.nix index e73eba8e142..32559c0e799 100644 --- a/pkgs/top-level/static.nix +++ b/pkgs/top-level/static.nix @@ -25,7 +25,7 @@ self: super: let }; in stdenv // { mkDerivation = args: stdenv.mkDerivation (args // { NIX_CFLAGS_LINK = toString (args.NIX_CFLAGS_LINK or "") - + optionalString stdenv.cc.isGNU " -static-libgcc"; + + optionalString (stdenv_.cc.isGNU or false) " -static-libgcc"; nativeBuildInputs = (args.nativeBuildInputs or []) ++ [ (makeSetupHook { substitutions = { libsystem = "${stdenv.cc.libc}/lib/libSystem.B.dylib"; |