diff options
| author | Jan Tojnar <jtojnar@gmail.com> | 2017-07-18 15:54:47 +0200 |
|---|---|---|
| committer | Jan Tojnar <jtojnar@gmail.com> | 2017-10-01 01:40:03 +0200 |
| commit | b34a8912955ef23c166e4f3d0e5af42f1c10c24a (patch) | |
| tree | 7742a1049750c64e74b3c52e22b726fbbd51c689 /pkgs/desktops/gnome-3/core/gcr/default.nix | |
| parent | feddf1b2780cb97e120d3102259084c15dbd975f (diff) | |
| download | nixpkgs-b34a8912955ef23c166e4f3d0e5af42f1c10c24a.tar nixpkgs-b34a8912955ef23c166e4f3d0e5af42f1c10c24a.tar.gz nixpkgs-b34a8912955ef23c166e4f3d0e5af42f1c10c24a.tar.bz2 nixpkgs-b34a8912955ef23c166e4f3d0e5af42f1c10c24a.tar.lz nixpkgs-b34a8912955ef23c166e4f3d0e5af42f1c10c24a.tar.xz nixpkgs-b34a8912955ef23c166e4f3d0e5af42f1c10c24a.tar.zst nixpkgs-b34a8912955ef23c166e4f3d0e5af42f1c10c24a.zip | |
gnome3.gcr: prevent dependency cycle
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.
Diffstat (limited to 'pkgs/desktops/gnome-3/core/gcr/default.nix')
| -rw-r--r-- | pkgs/desktops/gnome-3/core/gcr/default.nix | 6 |
1 files 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 ]; |