Unverified Commit d1a9ab99 authored by Randy Eckenrode's avatar Randy Eckenrode
Browse files

R: get libc++ headers on Darwin from stdenv.cc.libcxx

parent 06b27227

pkgs/applications/science/math/R/default.nix

+2 −4
Original line number Diff line number Diff line
@@ -36,7 +36,6 @@ 
  Cocoa,

  Foundation,

  libobjc,

  libcxx,

  tzdata,

  withRecommendedPackages ? true,

  enableStrictBarrier ? false,
@@ -120,7 +119,6 @@ stdenv.mkDerivation (finalAttrs: { 
      Cocoa

      Foundation

      libobjc

      libcxx

    ];

  strictDeps = true;
@@ -173,8 +171,8 @@ stdenv.mkDerivation (finalAttrs: { 
      --disable-R-framework

      --without-x

      OBJC="clang"

      CPPFLAGS="-isystem ${lib.getDev libcxx}/include/c++/v1"

      LDFLAGS="-L${lib.getLib libcxx}/lib"

      CPPFLAGS="-isystem ${lib.getInclude stdenv.cc.libcxx}/include/c++/v1"

      LDFLAGS="-L${lib.getLib stdenv.cc.libcxx}/lib"

    ''

    + ''

      )

pkgs/development/r-modules/generic-builder.nix

+1 −2
Original line number Diff line number Diff line
@@ -2,7 +2,6 @@ 
  stdenv,

  lib,

  R,

  libcxx,

  xvfb-run,

  util-linux,

  Cocoa,
@@ -38,7 +37,7 @@ stdenv.mkDerivation ( 
        libiconv

      ];



    env.NIX_CFLAGS_COMPILE = lib.optionalString stdenv.hostPlatform.isDarwin "-I${lib.getDev libcxx}/include/c++/v1";

    env.NIX_CFLAGS_COMPILE = lib.optionalString stdenv.hostPlatform.isDarwin "-I${lib.getInclude stdenv.cc.libcxx}/include/c++/v1";



    enableParallelBuilding = true;