diff options
| author | Ryan Trinkle <ryan.trinkle@gmail.com> | 2016-03-15 01:11:02 -0400 |
|---|---|---|
| committer | Ryan Trinkle <ryan.trinkle@gmail.com> | 2016-03-15 01:11:02 -0400 |
| commit | 440b301d0a296e07025a082fdaf199c104bbe967 (patch) | |
| tree | fba9605050d14c55e4aa2e5490e11606388d7697 /pkgs/development/haskell-modules/configuration-ghcjs.nix | |
| parent | ad0bf29e8791981c779408681f7e1fc705b0399d (diff) | |
| parent | a0ecf9cee2f36bbbbe3da58a95236a342b91832b (diff) | |
| download | nixpkgs-440b301d0a296e07025a082fdaf199c104bbe967.tar nixpkgs-440b301d0a296e07025a082fdaf199c104bbe967.tar.gz nixpkgs-440b301d0a296e07025a082fdaf199c104bbe967.tar.bz2 nixpkgs-440b301d0a296e07025a082fdaf199c104bbe967.tar.lz nixpkgs-440b301d0a296e07025a082fdaf199c104bbe967.tar.xz nixpkgs-440b301d0a296e07025a082fdaf199c104bbe967.tar.zst nixpkgs-440b301d0a296e07025a082fdaf199c104bbe967.zip | |
Merge pull request #13931 from mightybyte/unix-compat-needs-libiconv
ghcjs: on Darwin, build unix-compat with libiconv
Diffstat (limited to 'pkgs/development/haskell-modules/configuration-ghcjs.nix')
| -rw-r--r-- | pkgs/development/haskell-modules/configuration-ghcjs.nix | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/pkgs/development/haskell-modules/configuration-ghcjs.nix b/pkgs/development/haskell-modules/configuration-ghcjs.nix index 90f84d4387b..d75a7f889aa 100644 --- a/pkgs/development/haskell-modules/configuration-ghcjs.nix +++ b/pkgs/development/haskell-modules/configuration-ghcjs.nix @@ -24,6 +24,7 @@ self: super: network = addBuildTools super.network (pkgs.lib.optional pkgs.stdenv.isDarwin pkgs.darwin.libiconv); zlib = addBuildTools super.zlib (pkgs.lib.optional pkgs.stdenv.isDarwin pkgs.darwin.libiconv); + unix-compat = addBuildTools super.unix-compat (pkgs.lib.optional pkgs.stdenv.isDarwin pkgs.darwin.libiconv); # LLVM is not supported on this GHC; use the latest one. inherit (pkgs) llvmPackages; |