wroclaw-git-backups/nix
1
0
Fork 0
mirror of https://github.com/NixOS/nix synced 2025-06-28 05:21:16 +02:00
Code Activity

Merge branch 'master' into make

Browse source 
Conflicts:
	src/libexpr/eval.cc
This commit is contained in:
Eelco Dolstra 2014-01-21 15:30:01 +01:00
commit 81628a6ccc
34 changed files with 473 additions and 103 deletions
Download patch file Download diff file Expand all files Collapse all files

3
perl/lib/Nix/Config.pm.in
View file

@ -13,6 +13,7 @@ $storeDir = $ENV{"NIX_STORE_DIR"} || "@storedir@";
$bzip2 = "@bzip2@";
$xz = "@xz@";
$curl = "@curl@";
$openssl = "@openssl@";
$useBindings = "@perlbindings@" eq "yes";
@ -32,7 +33,7 @@ sub readConfig {
open CONFIG, "<$config" or die "cannot open `$config'";
while (<CONFIG>) {
/^\s*([\w|-]+)\s*=\s*(.*)$/ or next;
/^\s*([\w\-\.]+)\s*=\s*(.*)$/ or next;
$config{$1} = $2;
}
close CONFIG;