Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Make buildEnv overridable #27780

Merged
merged 1 commit into from Sep 14, 2017
Merged

Make buildEnv overridable #27780

merged 1 commit into from Sep 14, 2017

Conversation

tilpner
Copy link
Member

@tilpner tilpner commented Jul 30, 2017

Motivation for this change

callPackage already calls makeOverridable, but that just
makes the function that evaluates to buildEnv overridable,
not buildEnv itself.
If no overridable version of buildEnv is used during construction,
users can't override e.g. paths at all

Things done
  • Tested using sandboxing
    (nix.useSandbox on NixOS,
    or option build-use-sandbox in nix.conf
    on non-NixOS)
  • Built on platform(s)
    • NixOS
    • macOS
    • Linux
  • Tested via one or more NixOS test(s) if existing and applicable for the change (look inside nixos/tests)
  • Tested compilation of all pkgs that depend on this change using nix-shell -p nox --run "nox-review wip"
  • Tested execution of all binary files (usually in ./result/bin/)
  • Fits CONTRIBUTING.md.

@tilpner tilpner force-pushed the overridable-buildenv branch 3 times, most recently from e859d90 to 05331be Compare July 30, 2017 20:23
@tilpner
Copy link
Member Author

tilpner commented Jul 30, 2017

Should buildFHSUserEnv be overridable too?

@tilpner tilpner force-pushed the overridable-buildenv branch 2 times, most recently from eece066 to d01d1ae Compare July 30, 2017 20:29
@FRidh
Copy link
Member

FRidh commented Jul 31, 2017

It would be cleaner to put makeOverridable in the expression, i.e., before calling the package expression. Though it doesn't really matter...

@tilpner
Copy link
Member Author

tilpner commented Jul 31, 2017

@FRidh Do you mean inserting makeOverridable here?

@FRidh
Copy link
Member

FRidh commented Aug 1, 2017 via email

@tilpner tilpner force-pushed the overridable-buildenv branch 3 times, most recently from 94f8650 to 4da5bf2 Compare August 2, 2017 09:51
callPackage already calls makeOverridable, but that just
makes the function that evaluates to buildEnv overridable,
not buildEnv itself.
If no overridable version of buildEnv is used during construction,
users can't override e.g. `paths` at all
@NeQuissimus
Copy link
Member

This is good to go, right?

@FRidh FRidh merged commit 87f757e into NixOS:master Sep 14, 2017
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

3 participants