about summary refs log tree commit diff
path: root/nixos
diff options
context:
space:
mode:
authorThomas Tuegel <ttuegel@mailbox.org>2019-07-24 16:07:40 -0500
committerGitHub <noreply@github.com>2019-07-24 16:07:40 -0500
commit294e75e832594cda1a25df817f7717adb9ed49b6 (patch)
tree293eeedd3014ae0ac88a8b3642a478db0311edae /nixos
parent5806e71834c636b57f7e5f7b84f52d162f158cf3 (diff)
parent9235a8eaeff094c8e014b669c2e447b6e161e815 (diff)
downloadnixlib-294e75e832594cda1a25df817f7717adb9ed49b6.tar
nixlib-294e75e832594cda1a25df817f7717adb9ed49b6.tar.gz
nixlib-294e75e832594cda1a25df817f7717adb9ed49b6.tar.bz2
nixlib-294e75e832594cda1a25df817f7717adb9ed49b6.tar.lz
nixlib-294e75e832594cda1a25df817f7717adb9ed49b6.tar.xz
nixlib-294e75e832594cda1a25df817f7717adb9ed49b6.tar.zst
nixlib-294e75e832594cda1a25df817f7717adb9ed49b6.zip
Merge pull request #65339 from ttuegel/wrap-pinentry_qt5
pinentry: Use qt5.wrapQtApps as needed
Diffstat (limited to 'nixos')
-rw-r--r--nixos/modules/config/no-x-libs.nix2
1 files changed, 1 insertions, 1 deletions
diff --git a/nixos/modules/config/no-x-libs.nix b/nixos/modules/config/no-x-libs.nix
index aad02a9ca4e3..74cf74d74181 100644
--- a/nixos/modules/config/no-x-libs.nix
+++ b/nixos/modules/config/no-x-libs.nix
@@ -34,7 +34,7 @@ with lib;
       networkmanager-openvpn = super.networkmanager-openvpn.override { withGnome = false; };
       networkmanager-vpnc = super.networkmanager-vpnc.override { withGnome = false; };
       networkmanager-iodine = super.networkmanager-iodine.override { withGnome = false; };
-      pinentry = super.pinentry.override { gtk2 = null; gcr = null; qt = null; };
+      pinentry = super.pinentry.override { gtk2 = null; gcr = null; qt4 = null; qt5 = null; };
       gobject-introspection = super.gobject-introspection.override { x11Support = false; };
     }));
   };