public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

pinentry: fix cross-compilation

Browse Source
This commit is contained in:
Nick Spinale
2019-09-16 10:48:24 +00:00
parent 37e333af9a
commit a6635fbc19
2 changed files with 40 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkgs/tools/security/pinentry/default.nix
+5 -3
View File
@@ -1,4 +1,4 @@
{ fetchurl, fetchpatch, stdenv, lib, pkgconfig
{ fetchurl, fetchpatch, stdenv, lib, pkgconfig, autoreconfHook
, libgpgerror, libassuan
, libcap ? null, libsecret ? null, ncurses ? null, gtk2 ? null, gcr ? null
, qt4 ? null, qt5 ? null
@@ -23,7 +23,7 @@ mkDerivation rec {
sha256 = "0w35ypl960pczg5kp6km3dyr000m1hf0vpwwlh72jjkjza36c1v8";
};
nativeBuildInputs = [ pkgconfig ];
nativeBuildInputs = [ pkgconfig autoreconfHook ];
buildInputs =
[ libgpgerror libassuan libcap libsecret gtk2 gcr ncurses qt4 ]
++ stdenv.lib.optional (qt5 != null) qt5.qtbase;
@@ -32,7 +32,9 @@ mkDerivation rec {
substituteInPlace pinentry/pinentry-curses.c --replace ncursesw ncurses
'';
patches = lib.optionals (gtk2 != null) [
patches = [
./autoconf-ar.patch
] ++ lib.optionals (gtk2 != null) [
(fetchpatch {
url = "https://salsa.debian.org/debian/pinentry/raw/debian/1.1.0-1/debian/patches/"
+ "0007-gtk2-When-X11-input-grabbing-fails-try-again-over-0..patch";