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

volume_key: cross compilation fixes #58054

Merged
merged 1 commit into from
Jun 1, 2019
Merged

volume_key: cross compilation fixes #58054

merged 1 commit into from
Jun 1, 2019

Conversation

illegalprime
Copy link
Member

@illegalprime illegalprime commented Mar 21, 2019 •
edited
Loading

Motivation for this change

cross compile volume_key which is needed for udisks which is needed for NixOS.

EDIT: this actually depends on gpgme #58046 and nss (which i haven't posted yet because it's super hacky)

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)
  • Assured whether relevant documentation is up to date
  • Fits CONTRIBUTING.md.

matthewbauer
matthewbauer reviewed Mar 21, 2019
View reviewed changes
pkgs/development/libraries/volume-key/default.nix

buildInputs = [ glib cryptsetup nss utillinux gpgme ];
buildInputs = [ autoreconfHook glib cryptsetup nss utillinux gpgme ncurses ];
Copy link
Member

Choose a reason for hiding this comment

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

Autoreconfhook should definitely be in nativeBuildInputs.

Copy link
Member Author

Choose a reason for hiding this comment

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

placing it in nativeBuildInputs causes autoreconf to fail to find gpgme:

configure.ac:47: warning: macro 'AM_PATH_GPGME' not found in library
autoreconf: running: /nix/store/givz468l2rnq7qp42d5r471mj51sdqsd-autoconf-2.69/bin/autoconf --force
configure.ac:47: error: possibly undefined macro: AM_PATH_GPGME
      If this token and others are legitimate, please use m4_pattern_allow.
      See the Autoconf documentation.

Copy link
Member

Choose a reason for hiding this comment

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

Maybe some package should be in both inputs then.

@GrahamcOfBorg GrahamcOfBorg added 10.rebuild-darwin: 0 This PR does not cause any packages to rebuild on Darwin 10.rebuild-linux: 11-100 labels Mar 21, 2019
@veprbl veprbl added the 6.topic: cross-compilation Building packages on a different platform than they will be used on label Mar 23, 2019
@matthewbauer matthewbauer merged commit 6158c50 into NixOS:master Jun 1, 2019
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@Mic92 Mic92 Mic92 left review comments

@matthewbauer matthewbauer matthewbauer left review comments

Assignees
No one assigned
Labels
6.topic: cross-compilation Building packages on a different platform than they will be used on 10.rebuild-darwin: 0 This PR does not cause any packages to rebuild on Darwin 10.rebuild-linux: 11-100
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
5 participants
@illegalprime @matthewbauer @Mic92 @veprbl @GrahamcOfBorg