From adbba9d5f6f1769fe3bedc7033910cfbd8c9c2c6 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Tue, 18 Jul 2017 01:44:55 +0200 Subject: [PATCH] gnome3.gcr: propagate pkg-config dependencies The pinentry_gnome package requires gcr. Unfortunately, when configure asks about the library (or `pkg-config --libs gcr-base-3` is used) it fails because glib is not in scope. ``` $ pkg-config --libs gcr-base-3 Package glib-2.0 was not found in the pkg-config search path. Perhaps you should add the directory containing `glib-2.0.pc' to the PKG_CONFIG_PATH environment variable Package 'glib-2.0', required by 'gcr-base-3', not found ``` This commit moves glib and gtk to `propagatedBuildInputs` so pkgconfig could find them. See also 38b58bab62d60c3cd8a1cb0d3ccf3ade5d9cb2ee --- pkgs/desktops/gnome-3/core/gcr/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/desktops/gnome-3/core/gcr/default.nix b/pkgs/desktops/gnome-3/core/gcr/default.nix index 0798d69f9e6..e04bb734aea 100644 --- a/pkgs/desktops/gnome-3/core/gcr/default.nix +++ b/pkgs/desktops/gnome-3/core/gcr/default.nix @@ -8,11 +8,11 @@ stdenv.mkDerivation rec { outputs = [ "out" "dev" ]; buildInputs = [ - pkgconfig intltool gnupg glib gobjectIntrospection libxslt - libgcrypt libtasn1 dbus_glib gtk pango gdk_pixbuf atk makeWrapper vala_0_32 + pkgconfig intltool gnupg gobjectIntrospection libxslt + libgcrypt libtasn1 dbus_glib pango gdk_pixbuf atk makeWrapper vala_0_32 ]; - propagatedBuildInputs = [ p11_kit ]; + propagatedBuildInputs = [ glib gtk p11_kit ]; #doCheck = true;