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

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 14 additions & 2 deletions pkgs/development/libraries/volume-key/default.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,8 @@
{ stdenv, fetchgit, autoreconfHook, pkgconfig, gettext, python3
, ncurses, swig, glib, utillinux, cryptsetup, nss, gpgme
, autoconf, automake, libtool
, writeShellScriptBin
, buildPackages
}:

let
Expand All @@ -15,9 +18,18 @@ in stdenv.mkDerivation rec {

outputs = [ "out" "man" "dev" "py" ];

nativeBuildInputs = [ autoreconfHook pkgconfig gettext python3 ncurses swig ];
nativeBuildInputs = [ autoconf automake libtool pkgconfig gettext swig ];

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.


configureFlags = [
"--with-gpgme-prefix=${gpgme.dev}"
];

preConfigure = ''
export PYTHON="${buildPackages.python3}/bin/python"
export PYTHON3_CONFIG="${python3}/bin/python3-config"
'';

makeFlags = [
"pyexecdir=$(py)/${python3.sitePackages}"
Expand Down