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.

Sign up for GitHub

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

Jump to bottom

waf: explicityly use native versions of packages run during build #107000

Closed
wants to merge 1 commit into from
Closed

waf: explicityly use native versions of packages run during build #107000

wants to merge 1 commit into from

Conversation

Atemu
Copy link
Member

@Atemu Atemu commented Dec 16, 2020 •
edited

Motivation for this change

#106759

#106953 (comment)

Things done
  • Tested using sandboxing (nix.useSandbox on NixOS, or option sandbox in nix.conf on non-NixOS linux)
  • 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 nixpkgs-review --run "nixpkgs-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)
  • Ensured that relevant documentation is up to date
  • Fits CONTRIBUTING.md.

@Atemu Atemu mentioned this pull request Dec 16, 2020
Closed
@ofborg ofborg bot requested a review from vrthra December 16, 2020 05:08
@Atemu Atemu changed the base branch from master to staging December 16, 2020 05:55
raboof
raboof reviewed Dec 16, 2020
View reviewed changes
pkgs/development/tools/build-managers/waf/default.nix
@@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
sha256 = "1xbd1lmchq9pdrplkr2db28xqafyw753qbhnrfn8pxdg3inxxqvq";
};

buildInputs = [ python ensureNewerSourcesForZipFilesHook ];
nativeBuildInputs = [ buildPackages.python ensureNewerSourcesForZipFilesHook ];
Copy link
Member

Choose a reason for hiding this comment

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

Wouldn't this re-introduce a python 2 reference to the closure?

Copy link
Contributor

Choose a reason for hiding this comment

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

Since this will cause a rebuild anyway, how about removing the top-level override and using python3 explicitly so the splicing works properly?

@veprbl veprbl added the 6.topic: cross-compilation Building packages on a different sort platform than than they will be run on label Dec 17, 2020
@stale
Copy link

stale bot commented Aug 4, 2021

I marked this as stale due to inactivity. → More info

@stale stale bot added the 2.status: stale https://github.com/NixOS/nixpkgs/blob/master/.github/STALE-BOT.md label Aug 4, 2021
@Artturin Artturin mentioned this pull request Oct 15, 2021
Merged
12 tasks
@Artturin Artturin closed this Oct 16, 2021
@Atemu Atemu deleted the fix/waf-cross branch November 26, 2023 09:50
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@raboof raboof raboof left review comments

@r-burns r-burns r-burns left review comments

@vrthra vrthra Awaiting requested review from vrthra

Assignees
No one assigned
Labels
2.status: stale https://github.com/NixOS/nixpkgs/blob/master/.github/STALE-BOT.md 6.topic: cross-compilation Building packages on a different sort platform than than they will be run on 10.rebuild-darwin: 101-500 10.rebuild-linux: 501+ 10.rebuild-linux: 1001-2500
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
5 participants
@Atemu @raboof @r-burns @veprbl @Artturin