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

Merge pull request #17183 from mstone/darwin/fix-r-gettext-gfortran

Browse Source 
darwin: R: provide gettext and gfortran as buildInputs on Darwin.
This commit is contained in:
Peter Simons 2016-07-22 23:00:09 +02:00 committed by GitHub
commit 649db354bf
2 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -8,6 +8,7 @@ let
buildRPackage = pkgs.callPackage ./generic-builder.nix { buildRPackage = pkgs.callPackage ./generic-builder.nix {
inherit R; inherit R;
inherit (pkgs.darwin.apple_sdk.frameworks) Cocoa Foundation; inherit (pkgs.darwin.apple_sdk.frameworks) Cocoa Foundation;
inherit (pkgs) gettext gfortran;
}; };
# Generates package templates given per-repository settings # Generates package templates given per-repository settings

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

@ -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: { name, buildInputs ? [], ... } @ attrs:
stdenv.mkDerivation ({ stdenv.mkDerivation ({
buildInputs = buildInputs ++ [R] ++ 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]; stdenv.lib.optionals stdenv.isDarwin [Cocoa Foundation gettext gfortran];
NIX_CFLAGS_COMPILE = NIX_CFLAGS_COMPILE =
stdenv.lib.optionalString stdenv.isDarwin "-I${libcxx}/include/c++/v1"; stdenv.lib.optionalString stdenv.isDarwin "-I${libcxx}/include/c++/v1";