From cc3a5e1e45c15221431cb1a16ce84bef1fb1eaee Mon Sep 17 00:00:00 2001 From: Alyssa Ross Date: Sun, 25 Jul 2021 11:28:20 +0000 Subject: [PATCH] pantheon.granite: propagate dependencies All of these dependencies are pkg-config Requires, so dependent packages have to depend on all of them, or they'll get messages like this: meson.build:17:0: ERROR: Could not generate cargs for granite: Package gee-0.8 was not found in the pkg-config search path. Perhaps you should add the directory containing `gee-0.8.pc' to the PKG_CONFIG_PATH environment variable Package 'gee-0.8', required by 'granite', not found Hence, they should be propagated. --- pkgs/desktops/pantheon/granite/default.nix | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/pkgs/desktops/pantheon/granite/default.nix b/pkgs/desktops/pantheon/granite/default.nix index 2397dd8ffcf..7f3a6dc0983 100644 --- a/pkgs/desktops/pantheon/granite/default.nix +++ b/pkgs/desktops/pantheon/granite/default.nix @@ -46,16 +46,13 @@ stdenv.mkDerivation rec { wrapGAppsHook ]; - buildInputs = [ + propagatedBuildInputs = [ glib + gsettings-desktop-schemas # is_clock_format_12h uses "org.gnome.desktop.interface clock-format" gtk3 libgee ]; - propagatedBuildInputs = [ - gsettings-desktop-schemas # is_clock_format_12h uses "org.gnome.desktop.interface clock-format" - ]; - postPatch = '' chmod +x meson/post_install.py patchShebangs meson/post_install.py