public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

R: fix Darwin build

Browse Source 
Merged manually from https://github.com/NixOS/nixpkgs/pull/10623.
This commit is contained in:
Asko Soukka
2015-06-29 03:42:31 +03:00
committed by Peter Simons
parent 26f80d7a6f
commit a225a650bf
4 changed files with 34 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
pkgs/development/r-modules/default.nix
View File

@@ -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
#

8
pkgs/development/r-modules/generic-builder.nix
View File

@@ -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