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

zsh: set configureFlags and checkFlags at nix level, also fix cross #34689

Merged
merged 1 commit into from Feb 9, 2018
Merged

zsh: set configureFlags and checkFlags at nix level, also fix cross #34689

merged 1 commit into from Feb 9, 2018

Conversation

dtzWill
Copy link
Member

@dtzWill dtzWill commented Feb 7, 2018

Fix cross, modernize a bit while making changes.

As-is the use of 'configureFlags="..."' breaks cross compilation
as it drops the configure platforms arguments.

Set zprofile separately to handle $out.

  • Tested using sandboxing (nix.useSandbox on NixOS, or option build-use-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/)
  • Fits CONTRIBUTING.md.

@dtzWill
zsh: set configureFlags and checkFlags at nix level, also fix cross
2b8e900 
As-is the use of 'configureFlags="..."' breaks cross compilation
as it drops the configure platforms arguments.

Set zprofile separately to handle $out.
@GrahamcOfBorg
Copy link

Success on x86_64-linux (full log)

Partial log (click to expand)

shrinking /nix/store/hbq6hlgr37cyldh2i6hb80ricz75n8y7-zsh-5.4.2/lib/zsh/5.4.2/zsh/deltochar.so
shrinking /nix/store/hbq6hlgr37cyldh2i6hb80ricz75n8y7-zsh-5.4.2/lib/zsh/5.4.2/zsh/zle.so
shrinking /nix/store/hbq6hlgr37cyldh2i6hb80ricz75n8y7-zsh-5.4.2/lib/zsh/5.4.2/zsh/zleparameter.so
gzipping man pages under /nix/store/hbq6hlgr37cyldh2i6hb80ricz75n8y7-zsh-5.4.2/share/man/
strip is /nix/store/5qj61lcvzlap87rf6blvf8p577d482bv-binutils-2.28.1/bin/strip
stripping (with command strip and flags -S) in /nix/store/hbq6hlgr37cyldh2i6hb80ricz75n8y7-zsh-5.4.2/lib  /nix/store/hbq6hlgr37cyldh2i6hb80ricz75n8y7-zsh-5.4.2/bin 
patching script interpreter paths in /nix/store/hbq6hlgr37cyldh2i6hb80ricz75n8y7-zsh-5.4.2
/nix/store/hbq6hlgr37cyldh2i6hb80ricz75n8y7-zsh-5.4.2/share/zsh/5.4.2/functions/harden: interpreter directive changed from "/bin/sh" to "/nix/store/yq03c2ny43mc24j7dq5riznzb09ddhpq-bash-4.4-p12/bin/sh"
checking for references to /tmp/nix-build-zsh-5.4.2.drv-0 in /nix/store/hbq6hlgr37cyldh2i6hb80ricz75n8y7-zsh-5.4.2...
/nix/store/hbq6hlgr37cyldh2i6hb80ricz75n8y7-zsh-5.4.2

@GrahamcOfBorg
Copy link

Success on x86_64-darwin (full log)

Partial log (click to expand)

fi
mkdir -m 755 -p -- /nix/store/0sgwx4figz4fq36pcd2k69ff94lp1icc-zsh-5.4.2/share/zsh/5.4.2/help
make[1]: Leaving directory '/private/tmp/nix-build-zsh-5.4.2.drv-0/zsh-5.4.2/Doc'
post-installation fixup
gzipping man pages under /nix/store/0sgwx4figz4fq36pcd2k69ff94lp1icc-zsh-5.4.2/share/man/
strip is /nix/store/5a88zk3jgimdmzg8rfhvm93kxib3njf9-cctools-binutils-darwin/bin/strip
stripping (with command strip and flags -S) in /nix/store/0sgwx4figz4fq36pcd2k69ff94lp1icc-zsh-5.4.2/lib  /nix/store/0sgwx4figz4fq36pcd2k69ff94lp1icc-zsh-5.4.2/bin
patching script interpreter paths in /nix/store/0sgwx4figz4fq36pcd2k69ff94lp1icc-zsh-5.4.2
/nix/store/0sgwx4figz4fq36pcd2k69ff94lp1icc-zsh-5.4.2/share/zsh/5.4.2/functions/harden: interpreter directive changed from "/bin/sh" to "/nix/store/s8mff1kmnc63b21ybdid2ni0fw7mzy7r-bash-4.4-p12/bin/sh"
/nix/store/0sgwx4figz4fq36pcd2k69ff94lp1icc-zsh-5.4.2

@GrahamcOfBorg
Copy link

Success on aarch64-linux (full log)

Partial log (click to expand)

shrinking /nix/store/9qbdqjxnqfx4hccdabkxakvh13f85a0z-zsh-5.4.2/lib/zsh/5.4.2/zsh/rlimits.so
shrinking /nix/store/9qbdqjxnqfx4hccdabkxakvh13f85a0z-zsh-5.4.2/bin/zsh
shrinking /nix/store/9qbdqjxnqfx4hccdabkxakvh13f85a0z-zsh-5.4.2/bin/zsh-5.4.2
gzipping man pages under /nix/store/9qbdqjxnqfx4hccdabkxakvh13f85a0z-zsh-5.4.2/share/man/
strip is /nix/store/xmpjypwjmp2qi1chs5kr0hacnh161ls4-binutils-2.28.1/bin/strip
stripping (with command strip and flags -S) in /nix/store/9qbdqjxnqfx4hccdabkxakvh13f85a0z-zsh-5.4.2/lib  /nix/store/9qbdqjxnqfx4hccdabkxakvh13f85a0z-zsh-5.4.2/bin
patching script interpreter paths in /nix/store/9qbdqjxnqfx4hccdabkxakvh13f85a0z-zsh-5.4.2
/nix/store/9qbdqjxnqfx4hccdabkxakvh13f85a0z-zsh-5.4.2/share/zsh/5.4.2/functions/harden: interpreter directive changed from "/bin/sh" to "/nix/store/7fxbh1yhagvwbdrmdyyy5ghcjhwjndhs-bash-4.4-p12/bin/sh"
checking for references to /build in /nix/store/9qbdqjxnqfx4hccdabkxakvh13f85a0z-zsh-5.4.2...
/nix/store/9qbdqjxnqfx4hccdabkxakvh13f85a0z-zsh-5.4.2

@Mic92 Mic92 merged commit a1fe3ee into NixOS:master Feb 9, 2018
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
10.rebuild-darwin: 1-10 10.rebuild-linux: 1-10
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
3 participants
@dtzWill @GrahamcOfBorg @Mic92