nordic-dev.net/nixpkgs
nordic-dev.net/nixpkgs
2
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-11-01 15:11:25 +00:00
Code Issues Packages Projects Releases Wiki Activity

pinentry_qt: merge into pinentry

Browse Source
This commit is contained in:
Jan Tojnar 2017-12-16 03:20:06 +01:00
parent b212125b54
commit ba67110de3
No known key found for this signature in database
GPG Key ID: 7FAB2A15F7A607A4
4 changed files with 7 additions and 63 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
nixos/modules/config/no-x-libs.nix
View File

@ -35,7 +35,7 @@ with lib;
networkmanager_pptp = pkgs.networkmanager_pptp.override { withGnome = false; };
networkmanager_vpnc = pkgs.networkmanager_vpnc.override { withGnome = false; };
networkmanager_iodine = pkgs.networkmanager_iodine.override { withGnome = false; };
pinentry = pkgs.pinentry.override { gtk2 = null; qt4 = null; };
pinentry = pkgs.pinentry.override { gtk2 = null; };
};
};
}

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

@ -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 ];

49
pkgs/tools/security/pinentry/qt5.nix
View File

@ -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 ];
};
}

7
pkgs/top-level/all-packages.nix
View File

@ -3977,7 +3977,6 @@ with pkgs;
pinentry = callPackage ../tools/security/pinentry {
libcap = if stdenv.isDarwin then null else libcap;
qt4 = null;
};
pinentry_ncurses = pinentry.override {
@ -3989,11 +3988,11 @@ with pkgs;
};
pinentry_qt4 = pinentry_ncurses.override {
inherit qt4;
qt = qt4;
};
pinentry_qt5 = libsForQt5.callPackage ../tools/security/pinentry/qt5.nix {
libcap = if stdenv.isDarwin then null else libcap;
pinentry_qt5 = pinentry_ncurses.override {
qt = qt5.qtbase;
};
pinentry_mac = callPackage ../tools/security/pinentry-mac {