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

zstd: fix shebangs when cross-compiling #95368

Merged
merged 1 commit into from Aug 15, 2020

Conversation

lopsided98
Copy link
Contributor

Motivation for this change

When cross-compiling, zstdless has /bin/sh as a shebang, while zstdgrep has build-time bash. zstdgrep is manually patched for running the tests, and the automatic patchShebangs after installation doesn't convert build-time bash to runtime bash.

Since we can't run tests while cross-compiling anyway, I moved the manual patchShebangs to checkPhase. This prevents it from interfering with the automatic patchShebangs fixup when cross-compiling. For native builds, build and runtime bash are the same, so this still works fine.

cc @orivej

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.

@lopsided98
Copy link
Contributor Author

@ofborg build pkgsCross.aarch64-multiplatform.zstd

@nh2
Copy link
Contributor

nh2 commented Aug 14, 2020

Mass rebuild -> needs to go to staging.

@lopsided98 lopsided98 changed the base branch from master to staging August 14, 2020 00:22
@FRidh FRidh merged commit 6093f9e into NixOS:staging Aug 15, 2020
@lopsided98 lopsided98 deleted the zstd-cross-shebang branch August 16, 2020 04:58
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

4 participants