diff options
| author | Robin Gloster <mail@glob.in> | 2019-11-10 02:13:39 +0100 |
|---|---|---|
| committer | Jan Tojnar <jtojnar@gmail.com> | 2019-12-31 01:23:19 +0100 |
| commit | 006242fd5ac679889ff3f9bc074ffad95a43041f (patch) | |
| tree | 478bcb5f952dc4f87a00f1a3e4fa345481fc8c52 /pkgs/development/compilers/ghc | |
| parent | 81ffabdf4f228732607796fc3c58148c8d62affe (diff) | |
| download | nixpkgs-006242fd5ac679889ff3f9bc074ffad95a43041f.tar nixpkgs-006242fd5ac679889ff3f9bc074ffad95a43041f.tar.gz nixpkgs-006242fd5ac679889ff3f9bc074ffad95a43041f.tar.bz2 nixpkgs-006242fd5ac679889ff3f9bc074ffad95a43041f.tar.lz nixpkgs-006242fd5ac679889ff3f9bc074ffad95a43041f.tar.xz nixpkgs-006242fd5ac679889ff3f9bc074ffad95a43041f.tar.zst nixpkgs-006242fd5ac679889ff3f9bc074ffad95a43041f.zip | |
treewide: fix types for mkDerivation params
Diffstat (limited to 'pkgs/development/compilers/ghc')
| -rw-r--r-- | pkgs/development/compilers/ghc/8.4.4.nix | 2 | ||||
| -rw-r--r-- | pkgs/development/compilers/ghc/head.nix | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/pkgs/development/compilers/ghc/8.4.4.nix b/pkgs/development/compilers/ghc/8.4.4.nix index 73c7e4708d5..aa29635fee0 100644 --- a/pkgs/development/compilers/ghc/8.4.4.nix +++ b/pkgs/development/compilers/ghc/8.4.4.nix @@ -69,7 +69,7 @@ let ''; # Splicer will pull out correct variations - libDeps = platform: stdenv.lib.optional enableTerminfo [ ncurses ] + libDeps = platform: stdenv.lib.optional enableTerminfo ncurses ++ stdenv.lib.optional (!enableIntegerSimple) gmp ++ stdenv.lib.optional (platform.libc != "glibc" && !targetPlatform.isWindows) libiconv; diff --git a/pkgs/development/compilers/ghc/head.nix b/pkgs/development/compilers/ghc/head.nix index 8d22c0a674b..e9ecdedf371 100644 --- a/pkgs/development/compilers/ghc/head.nix +++ b/pkgs/development/compilers/ghc/head.nix @@ -74,7 +74,7 @@ let ''; # Splicer will pull out correct variations - libDeps = platform: stdenv.lib.optional enableTerminfo [ ncurses ] + libDeps = platform: stdenv.lib.optional enableTerminfo ncurses ++ stdenv.lib.optional (!enableIntegerSimple) gmp ++ stdenv.lib.optional (platform.libc != "glibc" && !targetPlatform.isWindows) libiconv ++ stdenv.lib.optional enableDwarf elfutils; |