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

Merge pull request #27468 from jtojnar/fix/pinentry-gnome

Browse Source 
pinentry: add GNOME frontend
This commit is contained in:
Graham Christensen
2017-10-02 07:29:23 -04:00
committed by GitHub
parent d8fe9476b7 3f7e3db744
commit 5af263c2af
4 changed files with 23 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
pkgs/tools/security/pinentry/default.nix
View File

@@ -1,12 +1,11 @@
{ fetchurl, fetchpatch, stdenv, lib, pkgconfig
, libgpgerror, libassuan, libcap ? null, ncurses ? null, gtk2 ? null, qt4 ? null
, libgpgerror, libassuan, libcap ? null, libsecret ? null, ncurses ? null, gtk2 ? null, gcr ? null, qt4 ? null
}:
let
mkFlag = pfxTrue: pfxFalse: cond: name: "--${if cond then pfxTrue else pfxFalse}-${name}";
mkEnable = mkFlag "enable" "disable";
mkWith = mkFlag "with" "without";
hasX = gtk2 != null || qt4 != null;
in
with stdenv.lib;
stdenv.mkDerivation rec {
@@ -17,7 +16,7 @@ stdenv.mkDerivation rec {
sha256 = "0ni7g4plq6x78p32al7m8h2zsakvg1rhfz0qbc3kdc7yq7nw4whn";
};
buildInputs = [ libgpgerror libassuan libcap gtk2 ncurses qt4 ];
buildInputs = [ libgpgerror libassuan libcap libsecret gtk2 gcr ncurses qt4 ];
prePatch = ''
substituteInPlace pinentry/pinentry-curses.c --replace ncursesw ncurses
@@ -39,12 +38,13 @@ stdenv.mkDerivation rec {
'';
configureFlags = [
(mkWith (libcap != null) "libcap")
(mkWith (hasX) "x")
(mkEnable (ncurses != null) "pinentry-curses")
(mkEnable true "pinentry-tty")
(mkEnable (gtk2 != null) "pinentry-gtk2")
(mkEnable (qt4 != null) "pinentry-qt4")
(mkWith (libcap != null) "libcap")
(mkEnable (libsecret != null) "libsecret")
(mkEnable (ncurses != null) "pinentry-curses")
(mkEnable true "pinentry-tty")
(mkEnable (gtk2 != null) "pinentry-gtk2")
(mkEnable (gcr != null) "pinentry-gnome3")
(mkEnable (qt4 != null) "pinentry-qt")
];
nativeBuildInputs = [ pkgconfig ];