diff --git a/pkgs/development/r-modules/default.nix b/pkgs/development/r-modules/default.nix index 92b3dc3c71ca..00f58aecb9ad 100644 --- a/pkgs/development/r-modules/default.nix +++ b/pkgs/development/r-modules/default.nix @@ -8,6 +8,7 @@ let buildRPackage = pkgs.callPackage ./generic-builder.nix { inherit R; inherit (pkgs.darwin.apple_sdk.frameworks) Cocoa Foundation; + inherit (pkgs) gettext gfortran; }; # Generates package templates given per-repository settings 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";