diff options
| author | Daiderd Jordan <daiderd@gmail.com> | 2018-01-07 09:55:15 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-01-07 09:55:15 +0100 |
| commit | 5a02143c206e8658e6e79047a6db206ace36f22d (patch) | |
| tree | 0de386befe2c1a6337d0808218436f3521ea1188 /pkgs/development/r-modules/default.nix | |
| parent | 84f973601404331e8670ecdc6fc22aa8c6b5b2d2 (diff) | |
| parent | 091c2b9f04189301f18ff0bc8336541d137f1d61 (diff) | |
| download | nixpkgs-5a02143c206e8658e6e79047a6db206ace36f22d.tar nixpkgs-5a02143c206e8658e6e79047a6db206ace36f22d.tar.gz nixpkgs-5a02143c206e8658e6e79047a6db206ace36f22d.tar.bz2 nixpkgs-5a02143c206e8658e6e79047a6db206ace36f22d.tar.lz nixpkgs-5a02143c206e8658e6e79047a6db206ace36f22d.tar.xz nixpkgs-5a02143c206e8658e6e79047a6db206ace36f22d.tar.zst nixpkgs-5a02143c206e8658e6e79047a6db206ace36f22d.zip | |
Merge pull request #33010 from LnL7/cacert-hook
cacert: add hook that sets SSL_CERT_FILE
Diffstat (limited to 'pkgs/development/r-modules/default.nix')
| -rw-r--r-- | pkgs/development/r-modules/default.nix | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/pkgs/development/r-modules/default.nix b/pkgs/development/r-modules/default.nix index a435ee65e52..b7b411a7dec 100644 --- a/pkgs/development/r-modules/default.nix +++ b/pkgs/development/r-modules/default.nix @@ -3,7 +3,7 @@ { R, pkgs, overrides }: let - inherit (pkgs) fetchurl stdenv lib; + inherit (pkgs) cacert fetchurl stdenv lib; buildRPackage = pkgs.callPackage ./generic-builder.nix { inherit R; @@ -912,9 +912,7 @@ let }); geojsonio = old.geojsonio.overrideDerivation (attrs: { - preConfigure = '' - export SSL_CERT_FILE=${pkgs.cacert}/etc/ssl/certs/ca-bundle.crt - ''; + buildInputs = [ cacert ] ++ attrs.buildInputs; }); rstan = old.rstan.overrideDerivation (attrs: { |