dev/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions 2 Packages Projects Releases Wiki Activity

treewide: Adjust SWITCHBOARD_PLUGS_PATH for switchboard-3

Browse Source 
Also use wrapGAppsHook4.
This commit is contained in:
Bobby Rong 2024-05-17 21:06:41 +08:00
parent cd10d479df
commit 276554d79c
No known key found for this signature in database
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
pkgs/desktops/pantheon/apps/switchboard/wrapper.nix
View File

@ -1,4 +1,4 @@
{ wrapGAppsHook3
{ wrapGAppsHook4
, glib
, lib
, stdenv
@ -32,7 +32,7 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [
glib
wrapGAppsHook3
wrapGAppsHook4
];
buildInputs = lib.forEach selectedPlugs (x: x.buildInputs)
@ -54,7 +54,7 @@ stdenv.mkDerivation rec {
preFixup = ''
gappsWrapperArgs+=(
--set SWITCHBOARD_PLUGS_PATH "$out/lib/switchboard"
--set SWITCHBOARD_PLUGS_PATH "$out/lib/switchboard-3"
)
'';

2
pkgs/desktops/pantheon/desktop/wingpanel/wrapper.nix
View File

@ -53,7 +53,7 @@ stdenv.mkDerivation rec {
preFixup = ''
gappsWrapperArgs+=(
--set WINGPANEL_INDICATORS_PATH "$out/lib/wingpanel"
--set SWITCHBOARD_PLUGS_PATH "${switchboard-with-plugs}/lib/switchboard"
--set SWITCHBOARD_PLUGS_PATH "${switchboard-with-plugs}/lib/switchboard-3"
)
'';