From 7d356ff69646e78c5f9a362ff8b5912fa9ecec7c Mon Sep 17 00:00:00 2001 From: 3noch Date: Sat, 25 Feb 2017 17:44:04 -0500 Subject: Disable large address space in GHC iOS X compiler Original: https://github.com/NixOS/nixpkgs-channels/commit/17cea33d1aa55fdc8beff1001882efa7cc142da1 --- pkgs/development/compilers/ghc/head.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'pkgs/development') diff --git a/pkgs/development/compilers/ghc/head.nix b/pkgs/development/compilers/ghc/head.nix index 0ca8e8c299eb..3ae7d9c61e45 100644 --- a/pkgs/development/compilers/ghc/head.nix +++ b/pkgs/development/compilers/ghc/head.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchgit, bootPkgs, perl, ncurses, libiconv, binutils, coreutils +{ stdenv, lib, fetchgit, bootPkgs, perl, ncurses, libiconv, binutils, coreutils , autoconf, automake, happy, alex, python3, buildPlatform, targetPlatform , selfPkgs, cross ? null @@ -105,7 +105,7 @@ in stdenv.mkDerivation (rec { "RANLIB=${stdenv.binutilsCross}/bin/${cross.config}-ranlib" "--target=${cross.config}" "--enable-bootstrap-with-devel-snapshot" - ]; + ] ++ (lib.optional ("${cross.config}" == "aarch64-apple-darwin14") "--disable-large-address-space"); buildInputs = commonBuildInputs ++ [ stdenv.ccCross stdenv.binutilsCross ]; -- cgit 1.4.1