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

Merge branch 'master' into update-ios-gnu-config

Browse Source
This commit is contained in:
Matthew Bauer
2019-05-07 14:25:33 -04:00
committed by GitHub
parent 5a69a4ecc1 929fe5ca21
commit 424f467e06
1343 changed files with 22995 additions and 13346 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkgs/stdenv/cross/default.nix
+3 -2
View File
@@ -37,7 +37,8 @@ in lib.init bootStages ++ [
# Run Packages
(buildPackages: {
inherit config;
overlays = overlays ++ crossOverlays;
overlays = overlays ++ crossOverlays
++ (if crossSystem.isWasm then [(import ../../top-level/static.nix)] else []);
selfBuild = false;
stdenv = buildPackages.stdenv.override (old: rec {
buildPlatform = localSystem;
@@ -63,7 +64,7 @@ in lib.init bootStages ++ [
(hostPlatform.isLinux && !buildPlatform.isLinux)
[ buildPackages.patchelf ]
++ lib.optional
(let f = p: !p.isx86 || p.libc == "musl" || p.isiOS; in f hostPlatform && !(f buildPlatform))
(let f = p: !p.isx86 || p.libc == "musl" || p.libc == "wasilibc" || p.isiOS; in f hostPlatform && !(f buildPlatform))
buildPackages.updateAutotoolsGnuConfigScriptsHook
# without proper `file` command, libtool sometimes fails
# to recognize 64-bit DLLs