diff options
| author | John Ericson <John.Ericson@Obsidian.Systems> | 2018-05-20 02:21:37 -0400 |
|---|---|---|
| committer | John Ericson <John.Ericson@Obsidian.Systems> | 2018-05-23 10:41:17 -0400 |
| commit | c7458ded5c34161a33773f872ab10f0dd0af4b2c (patch) | |
| tree | e40e77a844da3ab779ba7bde7fa7ccfb962eac56 /pkgs/development/compilers/ghc | |
| parent | 10b76a4caba015a5252cc88172d3b7d23b14d8f6 (diff) | |
| download | nixlib-c7458ded5c34161a33773f872ab10f0dd0af4b2c.tar nixlib-c7458ded5c34161a33773f872ab10f0dd0af4b2c.tar.gz nixlib-c7458ded5c34161a33773f872ab10f0dd0af4b2c.tar.bz2 nixlib-c7458ded5c34161a33773f872ab10f0dd0af4b2c.tar.lz nixlib-c7458ded5c34161a33773f872ab10f0dd0af4b2c.tar.xz nixlib-c7458ded5c34161a33773f872ab10f0dd0af4b2c.tar.zst nixlib-c7458ded5c34161a33773f872ab10f0dd0af4b2c.zip | |
ghc 8.4.2, head: Adjust enableShared enableTerminfo for windows
Diffstat (limited to 'pkgs/development/compilers/ghc')
| -rw-r--r-- | pkgs/development/compilers/ghc/8.4.2.nix | 7 | ||||
| -rw-r--r-- | pkgs/development/compilers/ghc/head.nix | 7 |
2 files changed, 10 insertions, 4 deletions
diff --git a/pkgs/development/compilers/ghc/8.4.2.nix b/pkgs/development/compilers/ghc/8.4.2.nix index 7cdf746c5820..18b229f95cc4 100644 --- a/pkgs/development/compilers/ghc/8.4.2.nix +++ b/pkgs/development/compilers/ghc/8.4.2.nix @@ -22,7 +22,10 @@ , # Whether to build dynamic libs for the standard library (on the target # platform). Static libs are always built. - enableShared ? !targetPlatform.useAndroidPrebuilt + enableShared ? !targetPlatform.isWindows && !targetPlatform.useAndroidPrebuilt + +, # Whetherto build terminfo. + enableTerminfo ? !targetPlatform.isWindows , # What flavour to build. An empty string indicates no # specific flavour and falls back to ghc default values. @@ -60,7 +63,7 @@ let ''; # Splicer will pull out correct variations - libDeps = platform: [ ncurses ] + libDeps = platform: stdenv.lib.optional enableTerminfo [ ncurses ] ++ stdenv.lib.optional (!enableIntegerSimple) gmp ++ stdenv.lib.optional (platform.libc != "glibc") libiconv; diff --git a/pkgs/development/compilers/ghc/head.nix b/pkgs/development/compilers/ghc/head.nix index 1fe6271033f4..7e4b26cda25e 100644 --- a/pkgs/development/compilers/ghc/head.nix +++ b/pkgs/development/compilers/ghc/head.nix @@ -22,7 +22,10 @@ , # Whether to build dynamic libs for the standard library (on the target # platform). Static libs are always built. - enableShared ? !targetPlatform.useAndroidPrebuilt + enableShared ? !targetPlatform.isWindows && !targetPlatform.useAndroidPrebuilt + +, # Whetherto build terminfo. + enableTerminfo ? !targetPlatform.isWindows , version ? "8.5.20180118" , # What flavour to build. An empty string indicates no @@ -61,7 +64,7 @@ let ''; # Splicer will pull out correct variations - libDeps = platform: [ ncurses ] + libDeps = platform: stdenv.lib.optional enableTerminfo [ ncurses ] ++ stdenv.lib.optional (!enableIntegerSimple) gmp ++ stdenv.lib.optional (platform.libc != "glibc") libiconv; |