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

Jump to bottom

zstd: Fix cross #91177

Merged
merged 1 commit into from Jun 20, 2020
Merged

zstd: Fix cross #91177

merged 1 commit into from Jun 20, 2020

Conversation

Ericson2314
Copy link
Member

Motivation for this change

CMake is a build-time dep, so we need to override it with buildPackages, explicitly.

CC @flokli

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.

@Ericson2314
zstd: Fix cross
a997afb 
CMake is a build-time dep, so we need to override it with
`buildPackages`, explicitly.
@flokli
Copy link
Contributor

flokli commented Jun 20, 2020

Confirmed this isn't a world rebuild for non-cross, and that it fixes cross compilation. Thanks a lot!

@flokli flokli merged commit 4cdd64d into NixOS:master Jun 20, 2020
@flokli flokli mentioned this pull request Jun 20, 2020
Closed
@prusnak prusnak mentioned this pull request Jun 20, 2020
Merged
10 tasks
@Ericson2314 Ericson2314 deleted the fix-zstd-cross branch June 20, 2020 16:43
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: 0 10.rebuild-linux: 0
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
2 participants
@Ericson2314 @flokli