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

pinentry: make GTK3 the default front-end

Browse Source 
See: https://github.com/NixOS/nixpkgs/issues/18559
This commit is contained in:
Jan Tojnar
2017-10-01 01:40:03 +02:00
parent b34a891295
commit 3f7e3db744
2 changed files with 6 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
nixos/modules/config/no-x-libs.nix
+1 -1
View File
@@ -35,7 +35,7 @@ with lib;
networkmanager_pptp = pkgs.networkmanager_pptp.override { withGnome = false; }; networkmanager_pptp = pkgs.networkmanager_pptp.override { withGnome = false; };
networkmanager_vpnc = pkgs.networkmanager_vpnc.override { withGnome = false; }; networkmanager_vpnc = pkgs.networkmanager_vpnc.override { withGnome = false; };
networkmanager_iodine = pkgs.networkmanager_iodine.override { withGnome = false; }; networkmanager_iodine = pkgs.networkmanager_iodine.override { withGnome = false; };
pinentry = pkgs.pinentry.override { gtk2 = null; qt4 = null; }; pinentry = pkgs.pinentry.override { gcr = null; gtk2 = null; qt4 = null; };
}; };
}; };
} }
pkgs/top-level/all-packages.nix
+5 -3
View File
@@ -3860,14 +3860,16 @@ with pkgs;
pinentry = callPackage ../tools/security/pinentry { pinentry = callPackage ../tools/security/pinentry {
libcap = if stdenv.isDarwin then null else libcap; libcap = if stdenv.isDarwin then null else libcap;
qt4 = null; qt4 = null;
gtk2 = null;
gcr = gnome3.gcr;
}; };
pinentry_ncurses = pinentry.override { pinentry_ncurses = pinentry.override {
gtk2 = null; gcr = null;
}; };
pinentry_gnome = pinentry_ncurses.override { pinentry_gtk2 = pinentry_ncurses.override {
gcr = gnome3.gcr; inherit gtk2;
}; };
pinentry_qt4 = pinentry_ncurses.override { pinentry_qt4 = pinentry_ncurses.override {