dev/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions 2 Packages Projects Releases Wiki Activity

Merge pull request #40360 from mnacamura/r-darwin-cctools

Browse Source 
rPackages: fix binutils path on Darwin
This commit is contained in:
Matthew Justin Bauer 2018-05-12 10:52:33 -05:00 committed by GitHub
commit d7c9dc22da
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -392,7 +392,7 @@ let
nat = [ pkgs.which ]; nat = [ pkgs.which ];
nat_nblast = [ pkgs.which ]; nat_nblast = [ pkgs.which ];
nat_templatebrains = [ pkgs.which ]; nat_templatebrains = [ pkgs.which ];
pbdZMQ = lib.optionals stdenv.isDarwin [ pkgs.binutils.bintools ]; pbdZMQ = lib.optionals stdenv.isDarwin [ pkgs.darwin.binutils ];
RMark = [ pkgs.which ]; RMark = [ pkgs.which ];
RPushbullet = [ pkgs.which ]; RPushbullet = [ pkgs.which ];
qtpaint = [ pkgs.cmake ]; qtpaint = [ pkgs.cmake ];
@ -409,7 +409,7 @@ let
fftw = [ pkgs.pkgconfig ]; fftw = [ pkgs.pkgconfig ];
geoCount = [ pkgs.pkgconfig ]; geoCount = [ pkgs.pkgconfig ];
gdtools = [ pkgs.pkgconfig ]; gdtools = [ pkgs.pkgconfig ];
JuniperKernel = lib.optionals stdenv.isDarwin [ pkgs.binutils.bintools ]; JuniperKernel = lib.optionals stdenv.isDarwin [ pkgs.darwin.binutils ];
kza = [ pkgs.pkgconfig ]; kza = [ pkgs.pkgconfig ];
magick = [ pkgs.pkgconfig ]; magick = [ pkgs.pkgconfig ];
mwaved = [ pkgs.pkgconfig ]; mwaved = [ pkgs.pkgconfig ];
@ -759,7 +759,7 @@ let
JuniperKernel = old.JuniperKernel.overrideDerivation (attrs: { JuniperKernel = old.JuniperKernel.overrideDerivation (attrs: {
postPatch = '' postPatch = ''
for file in {R,src}/*.R; do for file in {R,src}/*.R; do
sed -i 's#system("which \(otool\|install_name_tool\)"[^)]*)#"${pkgs.binutils.bintools}/bin/\1"#g' $file sed -i 's#system("which \(otool\|install_name_tool\)"[^)]*)#"${pkgs.darwin.cctools}/bin/\1"#g' $file
done done
''; '';
preConfigure = '' preConfigure = ''
@ -774,7 +774,7 @@ let
pbdZMQ = old.pbdZMQ.overrideDerivation (attrs: { pbdZMQ = old.pbdZMQ.overrideDerivation (attrs: {
postPatch = lib.optionalString stdenv.isDarwin '' postPatch = lib.optionalString stdenv.isDarwin ''
for file in R/*.{r,r.in}; do for file in R/*.{r,r.in}; do
sed -i 's#system("which \(\w\+\)"[^)]*)#"${pkgs.binutils.bintools}/bin/\1"#g' $file sed -i 's#system("which \(\w\+\)"[^)]*)#"${pkgs.darwin.cctools}/bin/\1"#g' $file
done done
''; '';
}); });