Merge pull request #58054 from illegalprime/volume_key-cross

volume_key: cross compilation fixes
NixOS · Jun 1, 2019 · 6158c50 · 6158c50
2 parents f21b846 + 30dd92f
commit 6158c50
Showing 1 changed file with 14 additions and 2 deletions.
diff --git a/pkgs/development/libraries/volume-key/default.nix b/pkgs/development/libraries/volume-key/default.nix
@@ -1,5 +1,8 @@
 { stdenv, fetchgit, autoreconfHook, pkgconfig, gettext, python3
 , ncurses, swig, glib, utillinux, cryptsetup, nss, gpgme
+, autoconf, automake, libtool
+, writeShellScriptBin
+, buildPackages
 }:
 
 let
@@ -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 ];
+
+  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}"