From e760de810824a92297387e629ba67bb22db2929a Mon Sep 17 00:00:00 2001 From: John Ericson Date: Mon, 18 Sep 2017 23:56:47 -0400 Subject: ghc: Predicate libiconv on not using glibc instead of Darwin --- pkgs/development/compilers/ghc/8.0.2.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'pkgs/development/compilers/ghc/8.0.2.nix') diff --git a/pkgs/development/compilers/ghc/8.0.2.nix b/pkgs/development/compilers/ghc/8.0.2.nix index b1870908927a..d72b70b2e4a9 100644 --- a/pkgs/development/compilers/ghc/8.0.2.nix +++ b/pkgs/development/compilers/ghc/8.0.2.nix @@ -51,7 +51,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 @@ -97,7 +97,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" -- cgit 1.4.1