diff options
| author | John Ericson <John.Ericson@Obsidian.Systems> | 2017-09-18 23:56:47 -0400 |
|---|---|---|
| committer | John Ericson <John.Ericson@Obsidian.Systems> | 2018-01-21 23:31:03 -0500 |
| commit | e760de810824a92297387e629ba67bb22db2929a (patch) | |
| tree | 6a2ebb2a4ca0a94c498a3f42b11b5bc3ca629883 /pkgs/development/compilers/ghc/7.10.3.nix | |
| parent | 398ac54593d1a1300f63d3a6d4869f66126b9e86 (diff) | |
| download | nixlib-e760de810824a92297387e629ba67bb22db2929a.tar nixlib-e760de810824a92297387e629ba67bb22db2929a.tar.gz nixlib-e760de810824a92297387e629ba67bb22db2929a.tar.bz2 nixlib-e760de810824a92297387e629ba67bb22db2929a.tar.lz nixlib-e760de810824a92297387e629ba67bb22db2929a.tar.xz nixlib-e760de810824a92297387e629ba67bb22db2929a.tar.zst nixlib-e760de810824a92297387e629ba67bb22db2929a.zip | |
ghc: Predicate libiconv on not using glibc instead of Darwin
Diffstat (limited to 'pkgs/development/compilers/ghc/7.10.3.nix')
| -rw-r--r-- | pkgs/development/compilers/ghc/7.10.3.nix | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/pkgs/development/compilers/ghc/7.10.3.nix b/pkgs/development/compilers/ghc/7.10.3.nix index 0d446baae821..4a30d052fc7f 100644 --- a/pkgs/development/compilers/ghc/7.10.3.nix +++ b/pkgs/development/compilers/ghc/7.10.3.nix @@ -57,7 +57,7 @@ let # Splicer will pull out correct variations libDeps = platform: [ ncurses ] ++ stdenv.lib.optional (!enableIntegerSimple) gmp - ++ stdenv.lib.optional (platform.libc == "libSystem") libiconv; + ++ stdenv.lib.optional (platform.libc != "glibc") libiconv; toolsForTarget = if hostPlatform == buildPlatform then @@ -105,7 +105,7 @@ stdenv.mkDerivation rec { "--with-curses-includes=${ncurses.dev}/include" "--with-curses-libraries=${ncurses.out}/lib" ] ++ stdenv.lib.optional (targetPlatform == hostPlatform && ! enableIntegerSimple) [ "--with-gmp-includes=${gmp.dev}/include" "--with-gmp-libraries=${gmp.out}/lib" - ] ++ stdenv.lib.optional (targetPlatform == hostPlatform && hostPlatform.isDarwin) [ + ] ++ stdenv.lib.optional (targetPlatform == hostPlatform && hostPlatform.libc != "glibc") [ "--with-iconv-includes=${libiconv}/include" "--with-iconv-libraries=${libiconv}/lib" ] ++ stdenv.lib.optionals (targetPlatform != hostPlatform) [ "--enable-bootstrap-with-devel-snapshot" |