diff options
| author | Herwig Hochleitner <herwig@bendlas.net> | 2017-07-24 13:38:07 +0200 |
|---|---|---|
| committer | Franz Pletz <fpletz@fnordicwalking.de> | 2017-08-22 00:26:27 +0200 |
| commit | 4e026c7b94a27701f582db2d99f4c9f47b4cec8c (patch) | |
| tree | b834e92c80d2a9d3837703ac12c7b0200ecbd21c /pkgs/tools/security/pinentry | |
| parent | 830d8b3b8fd507a5ec6610b476d2c5f7e0c8c3ea (diff) | |
| download | nixlib-4e026c7b94a27701f582db2d99f4c9f47b4cec8c.tar nixlib-4e026c7b94a27701f582db2d99f4c9f47b4cec8c.tar.gz nixlib-4e026c7b94a27701f582db2d99f4c9f47b4cec8c.tar.bz2 nixlib-4e026c7b94a27701f582db2d99f4c9f47b4cec8c.tar.lz nixlib-4e026c7b94a27701f582db2d99f4c9f47b4cec8c.tar.xz nixlib-4e026c7b94a27701f582db2d99f4c9f47b4cec8c.tar.zst nixlib-4e026c7b94a27701f582db2d99f4c9f47b4cec8c.zip | |
pinentry: fix keyboard/pointer grabbing bugs
use debian patches to get the gtk2 version to work with various tiling window managers Related reports: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=850708 https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=851707 https://github.com/ch11ng/exwm/issues/263 https://github.com/ch11ng/exwm/issues/279
Diffstat (limited to 'pkgs/tools/security/pinentry')
| -rw-r--r-- | pkgs/tools/security/pinentry/default.nix | 11 |
1 files changed, 10 insertions, 1 deletions
diff --git a/pkgs/tools/security/pinentry/default.nix b/pkgs/tools/security/pinentry/default.nix index 67b0b8aa2e24..667831373c55 100644 --- a/pkgs/tools/security/pinentry/default.nix +++ b/pkgs/tools/security/pinentry/default.nix @@ -1,4 +1,4 @@ -{ fetchurl, stdenv, pkgconfig +{ fetchurl, fetchpatch, stdenv, lib, pkgconfig , libgpgerror, libassuan, libcap ? null, ncurses ? null, gtk2 ? null, qt4 ? null }: @@ -23,6 +23,15 @@ stdenv.mkDerivation rec { substituteInPlace pinentry/pinentry-curses.c --replace ncursesw ncurses ''; + patches = lib.optionals (gtk2 != null) [ + (fetchpatch { + url = https://anonscm.debian.org/cgit/pkg-gnupg/pinentry.git/plain/debian/patches/0006-gtk2-Fix-a-problem-with-fvwm.patch; + sha256 = "1w3y4brqp74hy3fbfxqnqp6jf985bd6667ivy1crz50r3z9zsy09"; + })(fetchpatch { + url = https://anonscm.debian.org/cgit/pkg-gnupg/pinentry.git/plain/debian/patches/0007-gtk2-When-X11-input-grabbing-fails-try-again-over-0..patch; + sha256 = "046jy7k0n7fj74s5w1h6sq1ljg8y77i0xwi301kv53bhsp0xsirx"; + })]; + # configure cannot find moc on its own preConfigure = stdenv.lib.optionalString (qt4 != null) '' export QTDIR="${qt4}" |