diff options
| author | John Ericson <John.Ericson@Obsidian.Systems> | 2021-08-20 06:03:45 +0000 |
|---|---|---|
| committer | John Ericson <John.Ericson@Obsidian.Systems> | 2021-08-20 06:09:48 +0000 |
| commit | 3edba5edfceef20c613c37967685f5eb04d1877d (patch) | |
| tree | 88120499a4c8cf26e6e10f2899ee13f016da5e7c /pkgs/stdenv/cross/default.nix | |
| parent | 904625852d535bbe53cadb006c9e1137ab481818 (diff) | |
| download | nixpkgs-3edba5edfceef20c613c37967685f5eb04d1877d.tar nixpkgs-3edba5edfceef20c613c37967685f5eb04d1877d.tar.gz nixpkgs-3edba5edfceef20c613c37967685f5eb04d1877d.tar.bz2 nixpkgs-3edba5edfceef20c613c37967685f5eb04d1877d.tar.lz nixpkgs-3edba5edfceef20c613c37967685f5eb04d1877d.tar.xz nixpkgs-3edba5edfceef20c613c37967685f5eb04d1877d.tar.zst nixpkgs-3edba5edfceef20c613c37967685f5eb04d1877d.zip | |
pkgsStatic: Finally obviate overlay!
Diffstat (limited to 'pkgs/stdenv/cross/default.nix')
| -rw-r--r-- | pkgs/stdenv/cross/default.nix | 14 |
1 files changed, 9 insertions, 5 deletions
diff --git a/pkgs/stdenv/cross/default.nix b/pkgs/stdenv/cross/default.nix index 18a6e2a4737..613b8d5304c 100644 --- a/pkgs/stdenv/cross/default.nix +++ b/pkgs/stdenv/cross/default.nix @@ -35,12 +35,16 @@ in lib.init bootStages ++ [ }) # Run Packages - (buildPackages: { + (buildPackages: let + adaptStdenv = + if crossSystem.isStatic + then buildPackages.stdenvAdapters.makeStatic + else lib.id; + in { inherit config; - overlays = overlays ++ crossOverlays - ++ (if (with crossSystem; isWasm || isRedox) then [(import ../../top-level/static.nix)] else []); + overlays = overlays ++ crossOverlays; selfBuild = false; - stdenv = buildPackages.stdenv.override (old: rec { + stdenv = adaptStdenv (buildPackages.stdenv.override (old: rec { buildPlatform = localSystem; hostPlatform = crossSystem; targetPlatform = crossSystem; @@ -83,7 +87,7 @@ in lib.init bootStages ++ [ # to recognize 64-bit DLLs ++ lib.optional (hostPlatform.config == "x86_64-w64-mingw32") buildPackages.file ; - }); + })); }) ] |