diff options
author | Jan Tojnar <jtojnar@gmail.com> | 2017-12-16 03:20:06 +0100 |
---|---|---|
committer | Jan Tojnar <jtojnar@gmail.com> | 2017-12-16 03:26:30 +0100 |
commit | ba67110de3e0f38e8f3793e468ea50d47236c6e2 (patch) | |
tree | e2634d9de8a0f1478c27e663bfde260f7fd740e9 /pkgs/tools/security/pinentry | |
parent | b212125b5418fe181e320dbfefd0efc8e7c2e3d5 (diff) |
pinentry_qt: merge into pinentry
Diffstat (limited to 'pkgs/tools/security/pinentry')
-rw-r--r-- | pkgs/tools/security/pinentry/default.nix | 12 | ||||
-rw-r--r-- | pkgs/tools/security/pinentry/qt5.nix | 49 |
2 files changed, 3 insertions, 58 deletions
diff --git a/pkgs/tools/security/pinentry/default.nix b/pkgs/tools/security/pinentry/default.nix index 0d957fc97e086..47c7431e32dd3 100644 --- a/pkgs/tools/security/pinentry/default.nix +++ b/pkgs/tools/security/pinentry/default.nix @@ -1,5 +1,5 @@ { fetchurl, fetchpatch, stdenv, lib, pkgconfig -, libgpgerror, libassuan, libcap ? null, libsecret ? null, ncurses ? null, gtk2 ? null, gcr ? null, qt4 ? null +, libgpgerror, libassuan, libcap ? null, libsecret ? null, ncurses ? null, gtk2 ? null, gcr ? null, qt ? null }: let @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { sha256 = "0ni7g4plq6x78p32al7m8h2zsakvg1rhfz0qbc3kdc7yq7nw4whn"; }; - buildInputs = [ libgpgerror libassuan libcap libsecret gtk2 gcr ncurses qt4 ]; + buildInputs = [ libgpgerror libassuan libcap libsecret gtk2 gcr ncurses qt ]; prePatch = '' substituteInPlace pinentry/pinentry-curses.c --replace ncursesw ncurses @@ -31,12 +31,6 @@ stdenv.mkDerivation rec { sha256 = "046jy7k0n7fj74s5w1h6sq1ljg8y77i0xwi301kv53bhsp0xsirx"; })]; - # configure cannot find moc on its own - preConfigure = stdenv.lib.optionalString (qt4 != null) '' - export QTDIR="${qt4}" - export MOC="${qt4}/bin/moc" - ''; - configureFlags = [ (mkWith (libcap != null) "libcap") (mkEnable (libsecret != null) "libsecret") @@ -44,7 +38,7 @@ stdenv.mkDerivation rec { (mkEnable true "pinentry-tty") (mkEnable (gtk2 != null) "pinentry-gtk2") (mkEnable (gcr != null) "pinentry-gnome3") - (mkEnable (qt4 != null) "pinentry-qt") + (mkEnable (qt != null) "pinentry-qt") ]; nativeBuildInputs = [ pkgconfig ]; diff --git a/pkgs/tools/security/pinentry/qt5.nix b/pkgs/tools/security/pinentry/qt5.nix deleted file mode 100644 index 6230529a733a2..0000000000000 --- a/pkgs/tools/security/pinentry/qt5.nix +++ /dev/null @@ -1,49 +0,0 @@ -{ fetchurl, stdenv, pkgconfig -, libgpgerror, libassuan -, qtbase -, libcap ? null -}: - -let - mkFlag = pfxTrue: pfxFalse: cond: name: "--${if cond then pfxTrue else pfxFalse}-${name}"; - mkEnable = mkFlag "enable" "disable"; - mkWith = mkFlag "with" "without"; -in -with stdenv.lib; -stdenv.mkDerivation rec { - name = "pinentry-0.9.6"; - - src = fetchurl { - url = "mirror://gnupg/pinentry/${name}.tar.bz2"; - sha256 = "0rhyw1vk28kgasjp22myf7m2q8kycw82d65pr9kgh93z17lj849a"; - }; - - buildInputs = [ libgpgerror libassuan libcap qtbase ]; - - # configure cannot find moc on its own - preConfigure = '' - export QTDIR="${qtbase.dev}" - export MOC="${qtbase.dev}/bin/moc" - ''; - - configureFlags = [ - (mkWith (libcap != null) "libcap") - (mkEnable true "pinentry-qt") - ]; - - NIX_CFLAGS_COMPILE = [ "-std=c++11" ]; - - nativeBuildInputs = [ pkgconfig ]; - - meta = { - homepage = http://gnupg.org/aegypten2/; - description = "GnuPG's interface to passphrase input"; - license = stdenv.lib.licenses.gpl2Plus; - platforms = stdenv.lib.platforms.all; - longDescription = '' - Pinentry provides a console and (optional) GTK+ and Qt GUIs allowing users - to enter a passphrase when `gpg' or `gpg2' is run and needs it. - ''; - maintainers = [ stdenv.lib.maintainers.ttuegel ]; - }; -} |