diff options
| author | Asko Soukka <asko.soukka@iki.fi> | 2015-06-29 03:42:31 +0300 |
|---|---|---|
| committer | Peter Simons <simons@cryp.to> | 2016-01-06 22:20:40 +0100 |
| commit | a225a650bf8659ee30c535d8160f3f5288284837 (patch) | |
| tree | 34ad92fcc02917588d62b667f331a463529362b7 /pkgs/development/r-modules | |
| parent | 26f80d7a6fc0e3e8142bb1d09f81f755e51710b8 (diff) | |
| download | nixlib-a225a650bf8659ee30c535d8160f3f5288284837.tar nixlib-a225a650bf8659ee30c535d8160f3f5288284837.tar.gz nixlib-a225a650bf8659ee30c535d8160f3f5288284837.tar.bz2 nixlib-a225a650bf8659ee30c535d8160f3f5288284837.tar.lz nixlib-a225a650bf8659ee30c535d8160f3f5288284837.tar.xz nixlib-a225a650bf8659ee30c535d8160f3f5288284837.tar.zst nixlib-a225a650bf8659ee30c535d8160f3f5288284837.zip | |
R: fix Darwin build
Merged manually from https://github.com/NixOS/nixpkgs/pull/10623.
Diffstat (limited to 'pkgs/development/r-modules')
| -rw-r--r-- | pkgs/development/r-modules/default.nix | 5 | ||||
| -rw-r--r-- | pkgs/development/r-modules/generic-builder.nix | 8 |
2 files changed, 10 insertions, 3 deletions
diff --git a/pkgs/development/r-modules/default.nix b/pkgs/development/r-modules/default.nix index d72f9bca03d1..68e9fc6b4585 100644 --- a/pkgs/development/r-modules/default.nix +++ b/pkgs/development/r-modules/default.nix @@ -5,7 +5,10 @@ let inherit (pkgs) fetchurl stdenv lib; - buildRPackage = pkgs.callPackage ./generic-builder.nix { inherit R; }; + buildRPackage = pkgs.callPackage ./generic-builder.nix { + inherit R; + inherit (pkgs.darwin.apple_sdk.frameworks) Cocoa Foundation; + }; # 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 45c377635c90..62883af2c737 100644 --- a/pkgs/development/r-modules/generic-builder.nix +++ b/pkgs/development/r-modules/generic-builder.nix @@ -1,10 +1,14 @@ -{ stdenv, R, xvfb_run, utillinux }: +{ stdenv, R, libcxx, xvfb_run, utillinux, Cocoa, Foundation }: { name, buildInputs ? [], ... } @ attrs: stdenv.mkDerivation ({ buildInputs = buildInputs ++ [R] ++ - stdenv.lib.optionals attrs.requireX [utillinux xvfb_run]; + stdenv.lib.optionals attrs.requireX [utillinux xvfb_run] ++ + stdenv.lib.optionals stdenv.isDarwin [Cocoa Foundation]; + + NIX_CFLAGS_COMPILE = + stdenv.lib.optionalString stdenv.isDarwin "-I${libcxx}/include/c++/v1"; configurePhase = '' runHook preConfigure |