Unverified Commit 276554d7 authored by Bobby Rong's avatar Bobby Rong
Browse files

treewide: Adjust SWITCHBOARD_PLUGS_PATH for switchboard-3 

Also use wrapGAppsHook4.
parent cd10d479

pkgs/desktops/pantheon/apps/switchboard/wrapper.nix

+3 −3
Original line number Diff line number Diff line 
{ 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"

    )

  '';

pkgs/desktops/pantheon/desktop/wingpanel/wrapper.nix

+1 −1
Original line number Diff line number Diff line
@@ -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"

    )

  '';