diff options
| author | Michael Stone <mistone@akamai.com> | 2016-04-19 17:46:35 -0400 |
|---|---|---|
| committer | Michael Stone <mistone@akamai.com> | 2016-07-22 13:31:40 -0400 |
| commit | c1d24efd6a28372019b9c8cd110737b1739105dc (patch) | |
| tree | 8b45c4511ec5448f6be1143c1fbac742ae2b1bad /pkgs/development/r-modules/generic-builder.nix | |
| parent | e4b7b7b028e0ce724ea6e4bfad156b78d7ef7b8e (diff) | |
darwin: R: provide gettext and gfortran as buildInputs on Darwin.
As discussed in #10623, many R modules fail to build on Darwin without the
libraries and compilers provided by these packages.
For more detail, please see comment:
https://github.com/NixOS/nixpkgs/pull/10623#issuecomment-172375342
Diffstat (limited to 'pkgs/development/r-modules/generic-builder.nix')
| -rw-r--r-- | pkgs/development/r-modules/generic-builder.nix | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/pkgs/development/r-modules/generic-builder.nix b/pkgs/development/r-modules/generic-builder.nix index 62883af2c737..582b8aa44dc2 100644 --- a/pkgs/development/r-modules/generic-builder.nix +++ b/pkgs/development/r-modules/generic-builder.nix @@ -1,11 +1,11 @@ -{ stdenv, R, libcxx, xvfb_run, utillinux, Cocoa, Foundation }: +{ stdenv, R, libcxx, xvfb_run, utillinux, Cocoa, Foundation, gettext, gfortran }: { name, buildInputs ? [], ... } @ attrs: stdenv.mkDerivation ({ buildInputs = buildInputs ++ [R] ++ stdenv.lib.optionals attrs.requireX [utillinux xvfb_run] ++ - stdenv.lib.optionals stdenv.isDarwin [Cocoa Foundation]; + stdenv.lib.optionals stdenv.isDarwin [Cocoa Foundation gettext gfortran]; NIX_CFLAGS_COMPILE = stdenv.lib.optionalString stdenv.isDarwin "-I${libcxx}/include/c++/v1"; |