Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: NixOS/nix
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 9e43a4a04113
Choose a base ref
...
head repository: NixOS/nix
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: a7e55151a8d4
Choose a head ref
  • 3 commits
  • 1 file changed
  • 2 contributors

Commits on Apr 9, 2017

  1. Propagate NIX_BUILD_CORES to nix-shell environments

    @neilmayhew
    neilmayhew committed Apr 9, 2017
    Copy the full SHA
    f12a048 View commit details

Commits on May 24, 2017

  1. Merge branch 'topic/cores-master' of https://github.com/neilmayhew/nix

    @edolstra
    edolstra committed May 24, 2017
    Copy the full SHA
    fbe9fe0 View commit details

  2. Fix #1314 

    Also, make nix-shell respect --option. (Previously it only passed it
along to nix-instantiate and nix-build.)
    @edolstra
    edolstra committed May 24, 2017

    Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
    GPG key ID: 4AEE18F83AFDEB23
    Expired
    Verified
    Learn about vigilant mode
    Copy the full SHA
    a7e5515 View commit details
Showing with 2 additions and 0 deletions.
  1. +2 −0 src/nix-build/nix-build.cc
2 changes: 2 additions & 0 deletions src/nix-build/nix-build.cc
View file
Original file line number Diff line number Diff line change
@@ -196,6 +196,7 @@ int main(int argc, char ** argv)
buildArgs.push_back(arg);
buildArgs.push_back(args[n + 1]);
buildArgs.push_back(args[n + 2]);
settings.set(args[n + 1], args[n + 2]);
n += 2;
}

@@ -407,6 +408,7 @@ int main(int argc, char ** argv)

env["NIX_BUILD_TOP"] = env["TMPDIR"] = env["TEMPDIR"] = env["TMP"] = env["TEMP"] = tmp;
env["NIX_STORE"] = store->storeDir;
env["NIX_BUILD_CORES"] = std::to_string(settings.buildCores);

auto passAsFile = tokenizeString<StringSet>(get(drv.env, "passAsFile", ""));