diff options
Diffstat (limited to 'pkgs/desktops/pantheon/desktop/wingpanel')
-rw-r--r-- | pkgs/desktops/pantheon/desktop/wingpanel/default.nix | 2 | ||||
-rw-r--r-- | pkgs/desktops/pantheon/desktop/wingpanel/wrapper.nix | 31 |
2 files changed, 24 insertions, 9 deletions
diff --git a/pkgs/desktops/pantheon/desktop/wingpanel/default.nix b/pkgs/desktops/pantheon/desktop/wingpanel/default.nix index 1fc7304feb2..694166a5d64 100644 --- a/pkgs/desktops/pantheon/desktop/wingpanel/default.nix +++ b/pkgs/desktops/pantheon/desktop/wingpanel/default.nix @@ -31,7 +31,7 @@ stdenv.mkDerivation rec { passthru = { updateScript = pantheon.updateScript { - repoName = pname; + attrPath = "pantheon.${pname}"; }; }; diff --git a/pkgs/desktops/pantheon/desktop/wingpanel/wrapper.nix b/pkgs/desktops/pantheon/desktop/wingpanel/wrapper.nix index 6b554d89caa..596ee816f89 100644 --- a/pkgs/desktops/pantheon/desktop/wingpanel/wrapper.nix +++ b/pkgs/desktops/pantheon/desktop/wingpanel/wrapper.nix @@ -1,29 +1,44 @@ { lib -, makeWrapper +, wrapGAppsHook +, glib , symlinkJoin , wingpanel , wingpanelIndicators , switchboard-with-plugs , indicators ? null + # Only useful to disable for development testing. +, useDefaultIndicators ? true }: let - selectedIndicators = if indicators == null then wingpanelIndicators else indicators; + selectedIndicators = + if indicators == null then wingpanelIndicators + else indicators ++ (lib.optionals useDefaultIndicators wingpanelIndicators); in symlinkJoin { 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 # has a plugin to search switchboard settings postBuild = '' - wrapProgram $out/bin/wingpanel \ - --set WINGPANEL_INDICATORS_PATH "$out/lib/wingpanel" \ - --set SWITCHBOARD_PLUGS_PATH "${switchboard-with-plugs}/lib/switchboard" \ - --suffix XDG_DATA_DIRS : ${lib.concatMapStringsSep ":" (indicator: ''${indicator}/share/gsettings-schemas/${indicator.name}'') selectedIndicators} + make_glib_find_gsettings_schemas + + gappsWrapperArgs+=( + --set WINGPANEL_INDICATORS_PATH "$out/lib/wingpanel" + --set SWITCHBOARD_PLUGS_PATH "${switchboard-with-plugs}/lib/switchboard" + ) + + wrapGAppsHook ''; inherit (wingpanel) meta; |