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

Various cross-compilation fixes #68889

Merged
merged 4 commits into from Sep 17, 2019
Merged

Conversation

nspin
Copy link
Contributor

@nspin nspin commented Sep 16, 2019

Motivation for this change

Fixes cross-compilation for:

  • pinentry
  • gnupg
  • udisks2
  • dtc
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)
  • Ensured that relevant documentation is up to date
  • Fits CONTRIBUTING.md.
Notify maintainers

cc @

@@ -57,7 +57,7 @@ stdenv.mkDerivation rec {
preConfigure = "NOCONFIGURE=1 ./autogen.sh";

configureFlags = [
"--enable-gtk-doc"
"--${if stdenv.buildPlatform == stdenv.hostPlatform then "enable" else "disable"}-gtk-doc"
Copy link
Member

Choose a reason for hiding this comment

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

I think lib.enableFeature (stdenv.buildPlatform == stdenv.hostPlatform) "gtk-doc" would to the same thing?

Copy link
Contributor Author

@nspin nspin Sep 17, 2019

Choose a reason for hiding this comment

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

You're right - fixed.

dtc's build system does not support cross-compilation of its
swig-generated python bindings.
@ofborg ofborg bot requested a review from fpletz September 17, 2019 23:25
@matthewbauer matthewbauer merged commit 1bc7fae into NixOS:master Sep 17, 2019
@nspin nspin deleted the pr/various-cross-2 branch September 24, 2019 17:42
@jtojnar jtojnar mentioned this pull request Dec 2, 2020
10 tasks
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

3 participants