]> git.immae.eu Git - perso/Immae/Config/Nix.git/commitdiff
Add cacert as dependency when building private git
authorIsmaël Bouya <ismael.bouya@normalesup.org>
Sat, 29 Dec 2018 23:33:21 +0000 (00:33 +0100)
committerIsmaël Bouya <ismael.bouya@normalesup.org>
Sat, 29 Dec 2018 23:33:21 +0000 (00:33 +0100)
default.nix

index c32d23f569e6ed47d3058c435958f8ac79c46fd1..7580431a15d8011457a6a82ea769dadb1cedc28a 100644 (file)
@@ -244,8 +244,8 @@ let
 
   mastodon = stdenv.mkDerivation (fetchedGithub ./fetched/mastodon.json // rec {
     buildPhase = ''
 
   mastodon = stdenv.mkDerivation (fetchedGithub ./fetched/mastodon.json // rec {
     buildPhase = ''
-      export GIT_SSL_CAINFO=/etc/ssl/certs/ca-certificates.crt
-      export SSL_CERT_FILE=/etc/ssl/certs/ca-certificates.crt
+      export GIT_SSL_CAINFO=${cacert}/etc/ssl/certs/ca-bundle.crt
+      export SSL_CERT_FILE=${cacert}/etc/ssl/certs/ca-bundle.crt
 
       bundle install --deployment --without development test
       yarn install --pure-lockfile
 
       bundle install --deployment --without development test
       yarn install --pure-lockfile
@@ -258,7 +258,7 @@ let
       protobuf protobufc libidn libpqxx nodejs
       imagemagick ffmpeg libxml2 libxslt pkgconfig
       autoconf bison libyaml readline ncurses libffi gdbm
       protobuf protobufc libidn libpqxx nodejs
       imagemagick ffmpeg libxml2 libxslt pkgconfig
       autoconf bison libyaml readline ncurses libffi gdbm
-      jemalloc which postgresql python3
+      jemalloc which postgresql python3 cacert
     ];
   });
 # https://github.com/NixOS/nixpkgs/blob/master/pkgs/stdenv/generic/setup.sh
     ];
   });
 # https://github.com/NixOS/nixpkgs/blob/master/pkgs/stdenv/generic/setup.sh