From 8012aee0a7d9fe14fe77d20b6fdd8d2e6120bcc1 Mon Sep 17 00:00:00 2001 From: Will Fancher Date: Mon, 7 May 2018 23:52:34 -0400 Subject: [PATCH] Don't enableShared in GHC when using android prebuilt --- pkgs/development/compilers/ghc/8.4.2.nix | 2 +- pkgs/development/compilers/ghc/head.nix | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/compilers/ghc/8.4.2.nix b/pkgs/development/compilers/ghc/8.4.2.nix index bbe82354c8c..b588592a71c 100644 --- a/pkgs/development/compilers/ghc/8.4.2.nix +++ b/pkgs/development/compilers/ghc/8.4.2.nix @@ -22,7 +22,7 @@ , # Whether to build dynamic libs for the standard library (on the target # platform). Static libs are always built. - enableShared ? true + enableShared ? !targetPlatform.useAndroidPrebuilt , version ? "8.4.2" }: diff --git a/pkgs/development/compilers/ghc/head.nix b/pkgs/development/compilers/ghc/head.nix index f0e21b0cf5b..7e1c73d166a 100644 --- a/pkgs/development/compilers/ghc/head.nix +++ b/pkgs/development/compilers/ghc/head.nix @@ -22,7 +22,7 @@ , # Whether to build dynamic libs for the standard library (on the target # platform). Static libs are always built. - enableShared ? true + enableShared ? !targetPlatform.useAndroidPrebuilt , version ? "8.5.20180118" }: