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

Merge commit '2e56ba' from staging into master

Browse Source
This commit is contained in:
Tuomas Tynkkynen
2018-01-17 12:50:46 +02:00
parent 5ab499d2c7 2e56ba6fbd
commit 67c73b4e64
97 changed files with 231 additions and 305 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
pkgs/os-specific/linux/firmware/firmware-linux-nonfree/default.nix
View File

@@ -32,8 +32,7 @@ stdenv.mkDerivation rec {
# traffic, so don't do that.
preferLocalBuild = true;
nativeBuildInputs = [ git gnupg ];
NIX_SSL_CERT_FILE = "${cacert}/etc/ssl/certs/ca-bundle.crt";
nativeBuildInputs = [ cacert git gnupg ];
} ''
git init src && (
cd src