Merge branch 'master' of github.com:NixOS/nix into no-manifests

This commit is contained in:
Eelco Dolstra 2012-07-11 18:53:27 -04:00
commit 04559a0d45
12 changed files with 88 additions and 206 deletions

View file

@ -10,5 +10,6 @@ in {
xz = "@xz@";
tar = "@tar@";
tr = "@tr@";
curl = "@curl@";
nixBinDir = fromEnv "NIX_BIN_DIR" "@bindir@";
}