diff --git a/pkgs/desktops/pantheon/desktop/wingpanel-indicators/network/default.nix b/pkgs/desktops/pantheon/desktop/wingpanel-indicators/network/default.nix index 58844ccad7832..d5bb01cecb9b8 100644 --- a/pkgs/desktops/pantheon/desktop/wingpanel-indicators/network/default.nix +++ b/pkgs/desktops/pantheon/desktop/wingpanel-indicators/network/default.nix @@ -1,6 +1,7 @@ { lib , stdenv , fetchFromGitHub +, fetchpatch , nix-update-script , substituteAll , pkg-config @@ -17,15 +18,24 @@ stdenv.mkDerivation rec { pname = "wingpanel-indicator-network"; - version = "2.3.4"; + version = "7.0.1"; src = fetchFromGitHub { owner = "elementary"; repo = pname; rev = version; - sha256 = "sha256-j6USKTpiktDKH7jBV1FFg8f3HeNwEkMp3HxG/MeL41g="; + sha256 = "sha256-pz2sWN33d20/fMByR+XrNz2lxPdgCA6vxism3E/Fh/I="; }; + patches = [ + # PopoverWidget: fix flowbox child focus + # https://github.com/elementary/wingpanel-indicator-network/pull/288 + (fetchpatch { + url = "https://github.com/elementary/wingpanel-indicator-network/commit/88db9004249334e1316321e0373a3065900fe6f1.patch"; + sha256 = "sha256-rpAULo4qVPO3yr7cBVeKyT7L43zHVEdYLJD4x0ukBs4="; + }) + ]; + nativeBuildInputs = [ meson ninja diff --git a/pkgs/desktops/pantheon/services/xdg-desktop-portal-pantheon/default.nix b/pkgs/desktops/pantheon/services/xdg-desktop-portal-pantheon/default.nix index a7e0fae873f7a..8be2adad40f4f 100644 --- a/pkgs/desktops/pantheon/services/xdg-desktop-portal-pantheon/default.nix +++ b/pkgs/desktops/pantheon/services/xdg-desktop-portal-pantheon/default.nix @@ -6,25 +6,23 @@ , ninja , pkg-config , vala -, wrapGAppsHook +, wrapGAppsHook4 , glib -, granite -, gtk3 -, libhandy +, granite7 +, gtk4 , systemd -, vte , xorg }: stdenv.mkDerivation rec { pname = "xdg-desktop-portal-pantheon"; - version = "1.2.0"; + version = "7.0.0"; src = fetchFromGitHub { owner = "elementary"; repo = "portals"; rev = version; - sha256 = "sha256-DPCBC3/MJxy9d77ZYzK68FwN8kbyo7guYrkZC+onRBw="; + sha256 = "sha256-Rfo9Z5rCJgk36Db3ce8dYBJswy8owjvRMrJVB/RfwyI="; }; nativeBuildInputs = [ @@ -32,16 +30,14 @@ stdenv.mkDerivation rec { ninja pkg-config vala - wrapGAppsHook + wrapGAppsHook4 ]; buildInputs = [ glib - granite - gtk3 - libhandy + granite7 + gtk4 systemd - vte xorg.libX11 ];