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

libndctl: use buildPackages.which #58047

Merged
merged 1 commit into from
Mar 26, 2019

Conversation

illegalprime
Copy link
Member

Motivation for this change

Use build system's which instead of the host system's. (Also part of the effort to cross compile NixOS)

Things done
  • Tested using sandboxing (nix.useSandbox on NixOS, or option sandbox in nix.conf on non-NixOS)
  • Built on platform(s)
    • NixOS
    • macOS
    • other Linux distributions
  • 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/)
  • Determined the impact on package closure size (by running nix path-info -S before and after)
  • Assured whether relevant documentation is up to date
  • Fits CONTRIBUTING.md.

@GrahamcOfBorg GrahamcOfBorg added 10.rebuild-darwin: 0 This PR does not cause any packages to rebuild on Darwin 10.rebuild-linux: 0 This PR does not cause any packages to rebuild on Linux labels Mar 21, 2019
@@ -31,7 +32,7 @@ stdenv.mkDerivation rec {

patchPhase = ''
patchShebangs test
substituteInPlace configure.ac --replace "which" "${which}/bin/which"
substituteInPlace configure.ac --replace "which" "${buildPackages.which}/bin/which"
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Does just adding which to nativeBuildInputs also works?

@veprbl veprbl added the 6.topic: cross-compilation Building packages on a different platform than they will be used on label Mar 24, 2019
@GrahamcOfBorg GrahamcOfBorg added 10.rebuild-linux: 11-100 and removed 10.rebuild-linux: 0 This PR does not cause any packages to rebuild on Linux labels Mar 25, 2019
@matthewbauer matthewbauer merged commit 1ca86b4 into NixOS:master Mar 26, 2019
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
6.topic: cross-compilation Building packages on a different platform than they will be used on 10.rebuild-darwin: 0 This PR does not cause any packages to rebuild on Darwin 10.rebuild-linux: 11-100
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants