From 166b2a056b279ca98eaa981a4cd8590c9c15d079 Mon Sep 17 00:00:00 2001 From: Mikael Voss Date: Tue, 27 Aug 2024 23:52:05 +0200 Subject: [PATCH] Revert "gnome-settings-daemon: Remove dependency on libgnomekbd" This reverts commit 9b459b30fecb58dd80d9e7e1d61f43015484ca49. --- overlay/no-x.nix | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) diff --git a/overlay/no-x.nix b/overlay/no-x.nix index f596387..b089357 100644 --- a/overlay/no-x.nix +++ b/overlay/no-x.nix @@ -49,13 +49,6 @@ in genAttrs [ gd = prev.gd.override { withXorg = false; }; - gnome = prev.gnome.overrideScope (final: prev: { - gnome-settings-daemon = prev.gnome-settings-daemon.overrideAttrs (prevAttrs: { - buildInputs = prevAttrs.buildInputs - |> packages.remove [ "libgnomekbd" ]; - }); - }); - gst_all_1 = prev.gst_all_1 // genAttrs [ "gst-plugins-base" "gst-plugins-good" @@ -94,6 +87,11 @@ in genAttrs [ x11Support = false; }; + libgnomekbd = prev.libgnomekbd.overrideAttrs (prevAttrs: { + mesonFlags = prevAttrs.mesonFlags or [ ] + ++ [ (mesonBool "tests" false) ]; + }); + libsForQt5 = prev.libsForQt5.overrideScope (final: prev: { inherit (final') qt5;