From b34a8912955ef23c166e4f3d0e5af42f1c10c24a Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Tue, 18 Jul 2017 15:54:47 +0200 Subject: [PATCH] gnome3.gcr: prevent dependency cycle MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit When overriding gnupg to uss pinentry gnome3 frontend, there is a dependency cycle: gnupg → pinentry_gnome → gcr → gnupg This commit overrides the gnupg required by gcr to not build GUI. --- pkgs/desktops/gnome-3/core/gcr/default.nix | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/gnome-3/core/gcr/default.nix b/pkgs/desktops/gnome-3/core/gcr/default.nix index e04bb734aea..21b9d89e3c3 100644 --- a/pkgs/desktops/gnome-3/core/gcr/default.nix +++ b/pkgs/desktops/gnome-3/core/gcr/default.nix @@ -7,8 +7,10 @@ stdenv.mkDerivation rec { outputs = [ "out" "dev" ]; - buildInputs = [ - pkgconfig intltool gnupg gobjectIntrospection libxslt + buildInputs = let + gpg = gnupg.override { guiSupport = false; }; # prevent build cycle with pinentry_gnome + in [ + pkgconfig intltool gpg gobjectIntrospection libxslt libgcrypt libtasn1 dbus_glib pango gdk_pixbuf atk makeWrapper vala_0_32 ];