BoomMicrophone/nixpkgs-suyu
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

R: Add static argument.

Browse source 
R's autoconf does not use the normal configure flags for that.
This commit is contained in:
Niklas Hambüchen 2019-10-27 02:10:29 +01:00
parent 0347078949
commit edbe2d8145
1 changed files with 6 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
pkgs/applications/science/math/R/default.nix
View file

@ -4,6 +4,9 @@
, curl, Cocoa, Foundation, libobjc, libcxx, tzdata, fetchpatch , curl, Cocoa, Foundation, libobjc, libcxx, tzdata, fetchpatch
, withRecommendedPackages ? true , withRecommendedPackages ? true
, enableStrictBarrier ? false , enableStrictBarrier ? false
# R as of writing does not support outputting both .so and .a files; it outputs:
# --enable-R-static-lib conflicts with --enable-R-shlib and will be ignored
, static ? false
, javaSupport ? (!stdenv.hostPlatform.isAarch32 && !stdenv.hostPlatform.isAarch64) , javaSupport ? (!stdenv.hostPlatform.isAarch32 && !stdenv.hostPlatform.isAarch64)
}: }:
@ -33,6 +36,8 @@ stdenv.mkDerivation rec {
substituteInPlace configure --replace "-install_name libR.dylib" "-install_name $out/lib/R/lib/libR.dylib" substituteInPlace configure --replace "-install_name libR.dylib" "-install_name $out/lib/R/lib/libR.dylib"
''; '';
dontDisableStatic = static;
preConfigure = '' preConfigure = ''
configureFlagsArray=( configureFlagsArray=(
--disable-lto --disable-lto
@ -47,7 +52,7 @@ stdenv.mkDerivation rec {
--with-libtiff --with-libtiff
--with-ICU --with-ICU
${stdenv.lib.optionalString enableStrictBarrier "--enable-strict-barrier"} ${stdenv.lib.optionalString enableStrictBarrier "--enable-strict-barrier"}
--enable-R-shlib ${if static then "--enable-R-static-lib" else "--enable-R-shlib"}
AR=$(type -p ar) AR=$(type -p ar)
AWK=$(type -p gawk) AWK=$(type -p gawk)
CC=$(type -p cc) CC=$(type -p cc)