diff options
| author | Moritz Angermann <moritz.angermann@gmail.com> | 2019-08-23 18:53:22 +0200 |
|---|---|---|
| committer | John Ericson <git@JohnEricson.me> | 2019-09-02 01:27:05 -0400 |
| commit | 446f8c851d599326373a2c910841d092ff8e68ae (patch) | |
| tree | 2fa26cf138d9f71c2b593274600f2a70016392f9 /pkgs | |
| parent | 280795c163ba70d6d0c0c0fc2e87ce4c8801dbac (diff) | |
| download | nixlib-446f8c851d599326373a2c910841d092ff8e68ae.tar nixlib-446f8c851d599326373a2c910841d092ff8e68ae.tar.gz nixlib-446f8c851d599326373a2c910841d092ff8e68ae.tar.bz2 nixlib-446f8c851d599326373a2c910841d092ff8e68ae.tar.lz nixlib-446f8c851d599326373a2c910841d092ff8e68ae.tar.xz nixlib-446f8c851d599326373a2c910841d092ff8e68ae.tar.zst nixlib-446f8c851d599326373a2c910841d092ff8e68ae.zip | |
Add support for `js-unknown-ghcjs`
This adds enough logic to nixpkgs to support the `js-unknown-ghcjs` triple.
Diffstat (limited to 'pkgs')
| -rw-r--r-- | pkgs/stdenv/cross/default.nix | 2 | ||||
| -rw-r--r-- | pkgs/top-level/all-packages.nix | 1 |
2 files changed, 3 insertions, 0 deletions
diff --git a/pkgs/stdenv/cross/default.nix b/pkgs/stdenv/cross/default.nix index aafc0855dbe3..1c211f890b0c 100644 --- a/pkgs/stdenv/cross/default.nix +++ b/pkgs/stdenv/cross/default.nix @@ -54,6 +54,8 @@ in lib.init bootStages ++ [ then buildPackages.darwin.iosSdkPkgs.clang else if crossSystem.useAndroidPrebuilt or false then buildPackages."androidndkPkgs_${crossSystem.ndkVer}".gcc + else if targetPlatform.isGhcjs + then null else buildPackages.gcc; extraNativeBuildInputs = old.extraNativeBuildInputs diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 422cb99479ae..1f6cbe68daa5 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -9984,6 +9984,7 @@ in else if name == "msvcrt" then targetPackages.windows.mingw_w64 or windows.mingw_w64 else if stdenv.targetPlatform.useiOSPrebuilt then targetPackages.darwin.iosSdkPkgs.libraries or darwin.iosSdkPkgs.libraries else if name == "libSystem" then targetPackages.darwin.xcode + else if stdenv.targetPlatform.isGhcjs then null else throw "Unknown libc"; libcCross = assert stdenv.targetPlatform != stdenv.buildPlatform; libcCrossChooser stdenv.targetPlatform.libc; |