pantheon.wingpanel: wrap in the same way as switchboard

This commit is contained in:
worldofpeace 2019-11-25 22:30:54 -05:00
parent a0f3043189
commit 5b2f269fd8

View File

@ -1,5 +1,6 @@
{ lib { lib
, makeWrapper , wrapGAppsHook
, glib
, symlinkJoin , symlinkJoin
, wingpanel , wingpanel
, wingpanelIndicators , wingpanelIndicators
@ -13,17 +14,27 @@ in
symlinkJoin { symlinkJoin {
name = "${wingpanel.name}-with-indicators"; name = "${wingpanel.name}-with-indicators";
paths = [ wingpanel ] ++ selectedIndicators; paths = [
wingpanel
] ++ selectedIndicators;
buildInputs = [ makeWrapper ]; buildInputs = [
glib
wrapGAppsHook
] ++ (lib.forEach selectedIndicators (x: x.buildInputs))
++ selectedIndicators;
# We have to set SWITCHBOARD_PLUGS_PATH because wingpanel-applications-menu # We have to set SWITCHBOARD_PLUGS_PATH because wingpanel-applications-menu
# has a plugin to search switchboard settings # has a plugin to search switchboard settings
postBuild = '' postBuild = ''
wrapProgram $out/bin/wingpanel \ make_glib_find_gsettings_schemas
--set WINGPANEL_INDICATORS_PATH "$out/lib/wingpanel" \
--set SWITCHBOARD_PLUGS_PATH "${switchboard-with-plugs}/lib/switchboard" \ gappsWrapperArgs+=(
--suffix XDG_DATA_DIRS : ${lib.concatMapStringsSep ":" (indicator: ''${indicator}/share/gsettings-schemas/${indicator.name}'') selectedIndicators} --set WINGPANEL_INDICATORS_PATH "$out/lib/wingpanel"
--set SWITCHBOARD_PLUGS_PATH "${switchboard-with-plugs}/lib/switchboard"
)
wrapGAppsHook
''; '';
inherit (wingpanel) meta; inherit (wingpanel) meta;