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

50629.cross compile libksba #50649

Merged
merged 2 commits into from Nov 19, 2018
Merged

50629.cross compile libksba #50649

merged 2 commits into from Nov 19, 2018

Conversation

exarkun
Copy link
Contributor

@exarkun exarkun commented Nov 19, 2018 •
edited

Motivation for this change

libksba fails to cross-compile. Fixes #50629

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 nox --run "nox-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)
  • Fits CONTRIBUTING.md.

@exarkun
Fix cross-compilation of libksba.
74eba9f 
This explicitly points libksba configure script at the correct prefix for libgpgerror with dev tools.

It also provides a build-system compiler so that the asn1-gentables.c build helper can be compiled and run
on the build system.
matthewbauer
matthewbauer reviewed Nov 19, 2018
View reviewed changes
pkgs/development/libraries/libksba/default.nix Outdated
@@ -11,7 +11,9 @@ stdenv.mkDerivation rec {
outputs = [ "out" "dev" "info" ];

buildInputs = [ gettext ];
propagatedBuildInputs = [ libgpgerror ];
Copy link
Member

Choose a reason for hiding this comment

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

You should leave this in as it may need to be propagated in some places.

@matthewbauer
Copy link
Member

Otherwise looks good!

@exarkun
Restore libgpgerror as a propagatedBuildInput
cba12a0 
in case some dependencies require it
@matthewbauer matthewbauer changed the base branch from master to staging November 19, 2018 01:00
@matthewbauer matthewbauer changed the base branch from staging to staging-next November 19, 2018 01:01
@matthewbauer matthewbauer changed the base branch from staging-next to master November 19, 2018 01:01
@matthewbauer matthewbauer changed the base branch from master to staging November 19, 2018 01:04
@matthewbauer matthewbauer merged commit dfa36ed into NixOS:staging Nov 19, 2018
@matthewbauer
Copy link
Member

Thanks!

@exarkun exarkun deleted the 50629.cross-compile-libksba branch November 19, 2018 01:05
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@matthewbauer matthewbauer matthewbauer left review comments

Assignees
No one assigned
Labels
10.rebuild-darwin: 11-100 10.rebuild-linux: 501+
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
3 participants
@exarkun @matthewbauer @GrahamcOfBorg