diff options
author | worldofpeace <worldofpeace@protonmail.ch> | 2019-10-17 00:24:15 +0000 |
---|---|---|
committer | GitHub <noreply@github.com> | 2019-10-17 00:24:15 +0000 |
commit | 823da4d492b8b4ad46bf812db8421d99ff17a8fc (patch) | |
tree | 82549172077243a7706f405d98a2d68617f59113 /pkgs/top-level | |
parent | b75c8ee3bc1b9734c29740e9d17ac2175fe207fd (diff) | |
parent | e397b949a9439e0df7ad77e72a12410efc61a930 (diff) | |
download | nixpkgs-823da4d492b8b4ad46bf812db8421d99ff17a8fc.tar nixpkgs-823da4d492b8b4ad46bf812db8421d99ff17a8fc.tar.gz nixpkgs-823da4d492b8b4ad46bf812db8421d99ff17a8fc.tar.bz2 nixpkgs-823da4d492b8b4ad46bf812db8421d99ff17a8fc.tar.lz nixpkgs-823da4d492b8b4ad46bf812db8421d99ff17a8fc.tar.xz nixpkgs-823da4d492b8b4ad46bf812db8421d99ff17a8fc.tar.zst nixpkgs-823da4d492b8b4ad46bf812db8421d99ff17a8fc.zip |
Merge pull request #71095 from flokli/pinentry-cleanup
Split pinentry flavors and enable udisks2 on install media again
Diffstat (limited to 'pkgs/top-level')
-rw-r--r-- | pkgs/top-level/aliases.nix | 5 | ||||
-rw-r--r-- | pkgs/top-level/all-packages.nix | 37 |
2 files changed, 15 insertions, 27 deletions
diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index d4617a635f1..127bf8b2cdf 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -290,6 +290,11 @@ mapAliases ({ pg_hll = postgresqlPackages.pg_hll; pg_cron = postgresqlPackages.pg_cron; pg_topn = postgresqlPackages.pg_topn; + pinentry_curses = pinentry-curses; # added 2019-10-14 + pinentry_emacs = pinentry-emacs; # added 2019-10-14 + pinentry_gtk2 = pinentry-gtk2; # added 2019-10-14 + pinentry_qt = pinentry-qt; # added 2019-10-14 + pinentry_gnome = pinentry-gnome; # added 2019-10-14 postgis = postgresqlPackages.postgis; # end ppl-address-book = throw "deprecated in 2019-05-02: abandoned by upstream."; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 38b8b521248..be4e7875a1e 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -3497,10 +3497,12 @@ in gnupg1compat = callPackage ../tools/security/gnupg/1compat.nix { }; gnupg1 = gnupg1compat; # use config.packageOverrides if you prefer original gnupg1 gnupg20 = callPackage ../tools/security/gnupg/20.nix { - pinentry = if stdenv.isDarwin then pinentry_mac else pinentry; + guiSupport = stdenv.isDarwin; + pinentry = if stdenv.isDarwin then pinentry_mac else pinentry_gtk2; }; gnupg22 = callPackage ../tools/security/gnupg/22.nix { - pinentry = if stdenv.isDarwin then pinentry_mac else pinentry; + guiSupport = stdenv.isDarwin; + pinentry = if stdenv.isDarwin then pinentry_mac else pinentry_gtk2; }; gnupg = gnupg22; @@ -5519,34 +5521,15 @@ in phodav = callPackage ../tools/networking/phodav { }; - pinentry = callPackage ../tools/security/pinentry { + pinentry = libsForQt5.callPackage ../tools/security/pinentry { libcap = if stdenv.isDarwin then null else libcap; - gcr = null; - qt4 = null; - qt5 = null; - }; - - pinentry_ncurses = res.pinentry.override { - gtk2 = null; }; - pinentry_emacs = res.pinentry.override { - enableEmacs = true; - }; - - pinentry_gnome = res.pinentry.override { - inherit gcr; - }; - - pinentry_qt4 = res.pinentry.override { - gtk2 = null; - inherit qt4; - }; - - pinentry_qt5 = res.pinentry.override { - gtk2 = null; - inherit qt5; - }; + pinentry-curses = (stdenv.lib.getOutput "curses" pinentry); + pinentry-emacs = (stdenv.lib.getOutput "emacs" pinentry); + pinentry-gtk2 = (stdenv.lib.getOutput "gtk2" pinentry); + pinentry-qt = (stdenv.lib.getOutput "qt" pinentry); + pinentry-gnome = (stdenv.lib.getOutput "gnome" pinentry); pinentry_mac = callPackage ../tools/security/pinentry/mac.nix { inherit (darwin.apple_sdk.frameworks) Cocoa; |