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

Merge pull request #14869 from rardiol/factorio

Browse Source 
factorio: add explict dependency on cacert for chroot build
This commit is contained in:
Joachim Fasting 2016-04-21 16:21:14 +02:00
commit 79de9293c2
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
pkgs/games/factorio/fetch.nix
View File

@ -1,4 +1,4 @@
{ stdenv, curl { stdenv, curl, cacert
# Begin download parameters # Begin download parameters
, username ? "" , username ? ""
, password ? "" , password ? ""
@ -20,7 +20,7 @@ stdenv.mkDerivation {
buildInputs = [ curl ]; buildInputs = [ curl ];
inherit url loginUrl username password; inherit url loginUrl username password cacert;
builder = ./fetch.sh; builder = ./fetch.sh;

2
pkgs/games/factorio/fetch.sh
View File

@ -8,7 +8,7 @@ source $stdenv/setup
curl="curl \ curl="curl \
--max-redirs 20 \ --max-redirs 20 \
--retry 3 \ --retry 3 \
--cacert /etc/ssl/certs/ca-bundle.crt \ --cacert $cacert/etc/ssl/certs/ca-bundle.crt \
$curlOpts \ $curlOpts \
$NIX_CURL_FLAGS" $NIX_CURL_FLAGS"