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

restic: fix cross compilation #80778

Merged
merged 1 commit into from Mar 22, 2020
Merged

restic: fix cross compilation #80778

merged 1 commit into from Mar 22, 2020

Conversation

expipiplus1
Copy link
Contributor

Remove the custom build phase

Motivation for this change
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 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.
Notify maintainers

cc @mbrgm

  • What was the reson for the custom build phase, it seems to work fine
    without this.
  • The custom install phase is staying as there are some unwanted
    binaries moved into the store otherwise (build-release-binaries and
    prepare-release). Was the custom build phase to prevent building
    these binaries in the first place?

@expipiplus1
restic: fix cross compilation
25b70da 
Remove the custom build phase
@ofborg ofborg bot requested review from mbrgm and ehmry February 22, 2020 08:34
@expipiplus1
Copy link
Contributor Author

Is is possible for @ehmry and @mbrgm to take a look here, please?

@mbrgm
Copy link
Member

mbrgm commented Mar 13, 2020 •
edited

@expipiplus1 To be honest, I don't remember why I put the custom build phase in there. I have vague memories of the build failing without it in earlier versions. Cross-compilation did not work with the custom build phase? Just trying to grasp the motivation. Besides that lgtm.

Edit: Nevermind the question... got it.

@expipiplus1
Copy link
Contributor Author

expipiplus1 commented Mar 13, 2020 via email

@matthewbauer matthewbauer merged commit 0127594 into NixOS:master Mar 22, 2020
@expipiplus1
Copy link
Contributor Author

expipiplus1 commented Mar 25, 2020 via email

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@ehmry ehmry ehmry approved these changes

@mbrgm mbrgm mbrgm approved these changes

@doronbehar doronbehar doronbehar approved these changes

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
5 participants
@expipiplus1 @mbrgm @ehmry @doronbehar @matthewbauer