From 28988d08f4312c0b43ed901d2403c0168a62e0ca Mon Sep 17 00:00:00 2001 From: FliegendeWurst Date: Thu, 19 Dec 2024 18:45:47 +0100 Subject: [PATCH] R: fix and enable strictDeps --- pkgs/applications/science/math/R/default.nix | 15 ++++++++++++--- 1 file changed, 12 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/science/math/R/default.nix b/pkgs/applications/science/math/R/default.nix index 33ea13322db6..e472313d23de 100644 --- a/pkgs/applications/science/math/R/default.nix +++ b/pkgs/applications/science/math/R/default.nix @@ -28,12 +28,20 @@ stdenv.mkDerivation (finalAttrs: { dontUseImakeConfigure = true; - nativeBuildInputs = [ pkg-config ]; + nativeBuildInputs = [ + bison + imake + perl + pkg-config + tzdata + which + ]; buildInputs = [ bzip2 gfortran libX11 libXmu libXt libXt libjpeg libpng libtiff ncurses - pango pcre2 perl readline (texliveSmall.withPackages (ps: with ps; [ inconsolata helvetic ps.texinfo fancyvrb cm-super rsfs ])) xz zlib less texinfo graphviz icu - bison imake which blas lapack curl tcl tk jdk tzdata + pango pcre2 readline (texliveSmall.withPackages (ps: with ps; [ inconsolata helvetic ps.texinfo fancyvrb cm-super rsfs ])) xz zlib less texinfo graphviz icu + which blas lapack curl tcl tk jdk ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ Cocoa Foundation libobjc libcxx ]; + strictDeps = true; patches = [ ./no-usr-local-search-paths.patch @@ -75,6 +83,7 @@ stdenv.mkDerivation (finalAttrs: { FC="${gfortran}/bin/gfortran" F77="${gfortran}/bin/gfortran" JAVA_HOME="${jdk}" RANLIB=$(type -p ranlib) + CURL_CONFIG="${lib.getExe' (lib.getDev curl) "curl-config"}" r_cv_have_curl728=yes R_SHELL="${stdenv.shell}" '' + lib.optionalString stdenv.hostPlatform.isDarwin ''