diff options
| author | Peter Simons <simons@cryp.to> | 2015-02-22 21:55:27 +0100 |
|---|---|---|
| committer | Peter Simons <simons@cryp.to> | 2015-02-22 21:55:27 +0100 |
| commit | b8bf8e502c21f24d7a52fe83171d65d8272f4fd5 (patch) | |
| tree | 7909f838d8acd0510e894779b91d07f07c1d663a /pkgs/development/compilers | |
| parent | 0e9a0c9913a810af38cc644d4847b4b6bf3e5198 (diff) | |
| download | nixlib-b8bf8e502c21f24d7a52fe83171d65d8272f4fd5.tar nixlib-b8bf8e502c21f24d7a52fe83171d65d8272f4fd5.tar.gz nixlib-b8bf8e502c21f24d7a52fe83171d65d8272f4fd5.tar.bz2 nixlib-b8bf8e502c21f24d7a52fe83171d65d8272f4fd5.tar.lz nixlib-b8bf8e502c21f24d7a52fe83171d65d8272f4fd5.tar.xz nixlib-b8bf8e502c21f24d7a52fe83171d65d8272f4fd5.tar.zst nixlib-b8bf8e502c21f24d7a52fe83171d65d8272f4fd5.zip | |
ghc: re-instate code that configures statically linked builds by default
The compiler should not expect to have dynamic versions of all libraries available, because that configuration doesn't play along nicely with statically linked libraries. Fixes https://github.com/NixOS/nixpkgs/issues/6399.
Diffstat (limited to 'pkgs/development/compilers')
| -rw-r--r-- | pkgs/development/compilers/ghc/7.8.4.nix | 1 | ||||
| -rw-r--r-- | pkgs/development/compilers/ghc/head.nix | 1 |
2 files changed, 2 insertions, 0 deletions
diff --git a/pkgs/development/compilers/ghc/7.8.4.nix b/pkgs/development/compilers/ghc/7.8.4.nix index e9e1e1eafd03..c4000fc86c25 100644 --- a/pkgs/development/compilers/ghc/7.8.4.nix +++ b/pkgs/development/compilers/ghc/7.8.4.nix @@ -18,6 +18,7 @@ stdenv.mkDerivation rec { libraries/integer-gmp_CONFIGURE_OPTS += --configure-option=--with-gmp-includes="${gmp}/include" libraries/terminfo_CONFIGURE_OPTS += --configure-option=--with-curses-includes="${ncurses}/include" libraries/terminfo_CONFIGURE_OPTS += --configure-option=--with-curses-libraries="${ncurses}/lib" + DYNAMIC_BY_DEFAULT = NO ${stdenv.lib.optionalString stdenv.isDarwin '' libraries/base_CONFIGURE_OPTS += --configure-option=--with-iconv-includes="${libiconv}/include" libraries/base_CONFIGURE_OPTS += --configure-option=--with-iconv-libraries="${libiconv}/lib" diff --git a/pkgs/development/compilers/ghc/head.nix b/pkgs/development/compilers/ghc/head.nix index 0363855977f7..4cde21dbcc2a 100644 --- a/pkgs/development/compilers/ghc/head.nix +++ b/pkgs/development/compilers/ghc/head.nix @@ -7,6 +7,7 @@ let libraries/integer-gmp_CONFIGURE_OPTS += --configure-option=--with-gmp-includes="${gmp}/include" libraries/terminfo_CONFIGURE_OPTS += --configure-option=--with-curses-includes="${ncurses}/include" libraries/terminfo_CONFIGURE_OPTS += --configure-option=--with-curses-libraries="${ncurses}/lib" + DYNAMIC_BY_DEFAULT = NO ${stdenv.lib.optionalString stdenv.isDarwin '' libraries/base_CONFIGURE_OPTS += --configure-option=--with-iconv-includes="${libiconv}/include" libraries/base_CONFIGURE_OPTS += --configure-option=--with-iconv-libraries="${libiconv}/lib" |