alioth/nixpkgs
3
0
Fork 0
forked from mirrors/nixpkgs
Code Releases Activity

pinentry: Fix .override for pinentry_*

Browse source 
When you evaluate nixos/tests/simple.nix, you'll run into an infinite
recursion since 41b140cb25.

The reason is that udisks2 now pulls in gnupg because it now depends on
libblockdev, which in turn depends on volume_key and that depends on
gnupg.

Nevertheless, it's not the real reason, because this only means, that
since gnupg is now pulled into the closure of a basic nixos
configuration the real problem becomes visible:

In nixos/modules/config/no-x-libs.nix there is an overlay which does
something like this:

  nixpkgs.overlays = singleton (const (super: {
    pinentry = super.pinentry_ncurses;
  }));

Now since pinentry_ncurses is already using pinentry.override we get an
infinite recursion because now the pinentry attribute refers to
pinentry_ncurses, which by itself is again referring to pinentry.

This is solved by using the self.pinentry.override instead, so that the
override used by pinentry_ncurses doesn't use the attribute from the
overlay.

Signed-off-by: aszlig <aszlig@nix.build>
Cc: @ttuegel
Signed-off-by: aszlig <aszlig@nix.build>
This commit is contained in:
aszlig 2018-06-11 20:55:28 +02:00
parent fb2c132db4
commit d1a2853933
No known key found for this signature in database
GPG key ID: 684089CE67EBB691
1 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
pkgs/top-level/all-packages.nix
View file

@ -4440,23 +4440,23 @@ with pkgs;
libcap = if stdenv.isDarwin then null else libcap;
};
pinentry_ncurses = pinentry.override {
pinentry_ncurses = self.pinentry.override {
gtk2 = null;
};
pinentry_emacs = pinentry.override {
pinentry_emacs = self.pinentry.override {
enableEmacs = true;
};
pinentry_gnome = pinentry.override {
pinentry_gnome = self.pinentry.override {
gcr = gnome3.gcr;
};
pinentry_qt4 = pinentry.override {
pinentry_qt4 = self.pinentry.override {
qt = qt4;
};
pinentry_qt5 = pinentry.override {
pinentry_qt5 = self.pinentry.override {
qt = qt5.qtbase;
};