summaryrefslogtreecommitdiffstats
path: root/makefu/2configs/default.nix
diff options
context:
space:
mode:
authortv <tv@krebsco.de>2016-11-11 08:49:37 +0100
committertv <tv@krebsco.de>2016-11-11 08:49:37 +0100
commit0e13a4e2373d891e6a895e4b6ad2b42da028ba12 (patch)
tree1d8ca040ab86b462d6e3fd283997d56177fa4b33 /makefu/2configs/default.nix
parentb837dec290e54f532cd5539c93a663ba11f68c54 (diff)
parente6c7b13f5990d96e269ee12b9bf6b15bfa7d5b82 (diff)
Merge remote-tracking branch 'prism/master'
Diffstat (limited to 'makefu/2configs/default.nix')
-rw-r--r--makefu/2configs/default.nix8
1 files changed, 6 insertions, 2 deletions
diff --git a/makefu/2configs/default.nix b/makefu/2configs/default.nix
index cb6fe55b8..db69be2fa 100644
--- a/makefu/2configs/default.nix
+++ b/makefu/2configs/default.nix
@@ -10,7 +10,6 @@ with import <stockholm/lib>;
}
./vim.nix
./binary-cache/nixos.nix
- ./binary-cache/lass.nix
];
nixpkgs.config.allowUnfreePredicate = (pkg: pkgs.lib.hasPrefix "unrar-" pkg.name);
@@ -90,9 +89,14 @@ with import <stockholm/lib>;
"d /tmp 1777 root root - -"
];
nix.nixPath = [ "/var/src" ];
- environment.variables = {
+ environment.variables = let
+ ca-bundle = "${pkgs.cacert}/etc/ssl/certs/ca-bundle.crt";
+ in {
NIX_PATH = mkForce "/var/src";
EDITOR = mkForce "vim";
+ CURL_CA_BUNDLE = ca-bundle;
+ GIT_SSL_CAINFO = ca-bundle;
+ SSL_CERT_FILE = ca-bundle;
};
environment.systemPackages = with pkgs; [