diff options
| -rw-r--r-- | corepkgs/buildenv.nix | 4 | ||||
| -rw-r--r-- | corepkgs/nar.nix | 5 | ||||
| -rwxr-xr-x | scripts/nix-push.in | 2 | ||||
| -rw-r--r-- | src/nix-env/user-env.cc | 1 |
4 files changed, 6 insertions, 6 deletions
diff --git a/corepkgs/buildenv.nix b/corepkgs/buildenv.nix index 6e2bee10b1e7..641231dd9ee1 100644 --- a/corepkgs/buildenv.nix +++ b/corepkgs/buildenv.nix @@ -1,10 +1,10 @@ with import <nix/config.nix>; -{ system, derivations, manifest }: +{ derivations, manifest }: derivation { name = "user-environment"; - system = system; + system = builtins.currentSystem; builder = perl; args = [ "-w" ./buildenv.pl ]; diff --git a/corepkgs/nar.nix b/corepkgs/nar.nix index 70a4af2f9ddb..5be8be10c166 100644 --- a/corepkgs/nar.nix +++ b/corepkgs/nar.nix @@ -20,11 +20,12 @@ let in -{ system, storePath, hashAlgo }: +{ storePath, hashAlgo }: derivation { name = "nar"; + system = builtins.currentSystem; builder = shell; args = [ "-e" builder ]; - inherit system storePath hashAlgo; + inherit storePath hashAlgo; } diff --git a/scripts/nix-push.in b/scripts/nix-push.in index 1e0918abd6ac..a1c02190bd6c 100755 --- a/scripts/nix-push.in +++ b/scripts/nix-push.in @@ -103,7 +103,7 @@ foreach my $storePath (@storePaths) { # Construct a Nix expression that creates a Nix archive. my $nixexpr = "(import <nix/nar.nix> " . - "{ storePath = builtins.storePath \"$storePath\"; system = \"@system@\"; hashAlgo = \"$hashAlgo\"; }) "; + "{ storePath = builtins.storePath \"$storePath\"; hashAlgo = \"$hashAlgo\"; }) "; print NIX $nixexpr; } diff --git a/src/nix-env/user-env.cc b/src/nix-env/user-env.cc index 0dcdcc0d186f..4480a17aa923 100644 --- a/src/nix-env/user-env.cc +++ b/src/nix-env/user-env.cc @@ -118,7 +118,6 @@ bool createUserEnv(EvalState & state, DrvInfos & elems, builder with the manifest as argument. */ Value args, topLevel; state.mkAttrs(args, 3); - mkString(*state.allocAttr(args, state.sSystem), thisSystem); mkString(*state.allocAttr(args, state.symbols.create("manifest")), manifestFile, singleton<PathSet>(manifestFile)); args.attrs->push_back(Attr(state.symbols.create("derivations"), &manifest)); |