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

Batch of cross compilation fixes #61086

Merged
merged 11 commits into from May 7, 2019
Merged

Batch of cross compilation fixes #61086

merged 11 commits into from May 7, 2019

Conversation

globin
Copy link
Member

@globin globin commented May 7, 2019

Motivation for this change

Fix cross builds

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 nix-review --run "nix-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.

@ofborg ofborg bot requested review from pSub, lovek323 and 7c6f434c May 7, 2019 14:23
@veprbl veprbl added the 6.topic: cross-compilation Building packages on a different sort platform than than they will be run on label May 7, 2019
@globin globin changed the base branch from master to staging May 7, 2019 16:11
pSub
pSub reviewed May 7, 2019
View reviewed changes
Copy link
Member

@pSub pSub left a comment

Choose a reason for hiding this comment

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

👍 for dmenu

Ericson2314
Ericson2314 approved these changes May 7, 2019
View reviewed changes
Copy link
Member

@Ericson2314 Ericson2314 left a comment

Choose a reason for hiding this comment

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

Looks go to me. Thanks @globin!

@globin globin merged commit f41599a into NixOS:staging May 7, 2019
@globin globin deleted the cross-fixes branch May 8, 2019 20:07
pull bot pushed a commit to avitex/nixpkgs that referenced this pull request May 30, 2019
@vcunat
btrfs-progs: hack to make it build on i686-linux
aa440d8 
/cc NixOS#61086.  I just wanted to unblock channels quickly.
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@pSub pSub pSub left review comments

@matthewbauer matthewbauer matthewbauer approved these changes

@Ericson2314 Ericson2314 Ericson2314 approved these changes

@7c6f434c 7c6f434c 7c6f434c approved these changes

@lovek323 lovek323 Awaiting requested review from lovek323

Assignees
No one assigned
Labels
6.topic: cross-compilation Building packages on a different sort platform than than they will be run on 10.rebuild-darwin: 501-1000 10.rebuild-darwin: 501+ 10.rebuild-linux: 501+ 10.rebuild-linux: 5001+
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
7 participants
@globin @matthewbauer @pSub @Ericson2314 @vcunat @7c6f434c @veprbl