jade/lix
0
0
Fork 0
forked from lix-project/lix
Code Pull requests Activity

Remove unnecessary "system" argument

Browse source
This commit is contained in:
Eelco Dolstra 2012-04-14 18:48:11 +02:00
parent e855c7e2c9
commit ef902274fd
4 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
corepkgs/buildenv.nix
View file

@ -1,10 +1,10 @@
with import <nix/config.nix>; with import <nix/config.nix>;
{ system, derivations, manifest }: { derivations, manifest }:
derivation { derivation {
name = "user-environment"; name = "user-environment";
system = system; system = builtins.currentSystem;
builder = perl; builder = perl;
args = [ "-w" ./buildenv.pl ]; args = [ "-w" ./buildenv.pl ];

5
corepkgs/nar.nix
View file

@ -20,11 +20,12 @@ let
in in
{ system, storePath, hashAlgo }: { storePath, hashAlgo }:
derivation { derivation {
name = "nar"; name = "nar";
system = builtins.currentSystem;
builder = shell; builder = shell;
args = [ "-e" builder ]; args = [ "-e" builder ];
inherit system storePath hashAlgo; inherit storePath hashAlgo;
} }

2
scripts/nix-push.in
View file

@ -103,7 +103,7 @@ foreach my $storePath (@storePaths) {
# Construct a Nix expression that creates a Nix archive. # Construct a Nix expression that creates a Nix archive.
my $nixexpr = my $nixexpr =
"(import <nix/nar.nix> " . "(import <nix/nar.nix> " .
"{ storePath = builtins.storePath \"$storePath\"; system = \"@system@\"; hashAlgo = \"$hashAlgo\"; }) "; "{ storePath = builtins.storePath \"$storePath\"; hashAlgo = \"$hashAlgo\"; }) ";
print NIX $nixexpr; print NIX $nixexpr;
} }

1
src/nix-env/user-env.cc
View file

@ -118,7 +118,6 @@ bool createUserEnv(EvalState & state, DrvInfos & elems,
builder with the manifest as argument. */ builder with the manifest as argument. */
Value args, topLevel; Value args, topLevel;
state.mkAttrs(args, 3); state.mkAttrs(args, 3);
mkString(*state.allocAttr(args, state.sSystem), thisSystem);
mkString(*state.allocAttr(args, state.symbols.create("manifest")), mkString(*state.allocAttr(args, state.symbols.create("manifest")),
manifestFile, singleton<PathSet>(manifestFile)); manifestFile, singleton<PathSet>(manifestFile));
args.attrs->push_back(Attr(state.symbols.create("derivations"), &manifest)); args.attrs->push_back(Attr(state.symbols.create("derivations"), &manifest));