Merge pull request #17183 from mstone/darwin/fix-r-gettext-gfortran
darwin: R: provide gettext and gfortran as buildInputs on Darwin.
This commit is contained in:
commit
649db354bf
@ -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
|
||||
|
@ -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";
|
||||
|
Loading…
Reference in New Issue
Block a user