diff --git a/pkgs/applications/system/monitor/default.nix b/pkgs/applications/system/monitor/default.nix index d949ab2eb1f8..5115a6e12d72 100644 --- a/pkgs/applications/system/monitor/default.nix +++ b/pkgs/applications/system/monitor/default.nix @@ -84,6 +84,12 @@ stdenv.mkDerivation rec { substituteInPlace meson.build --replace \ "meson.get_compiler('c').find_library('libcurl', dirs: vapidir)" \ "meson.get_compiler('c').find_library('libcurl', dirs: '${curl.out}/lib')" + + # Fix build with Vala 0.56.18 + # https://github.com/elementary/monitor/issues/444 + for i in $(find src/Resources -type f -name "*.vala"); do + substituteInPlace $i --replace-warn "[Compact]" "" + done ''; passthru = { diff --git a/pkgs/desktops/pantheon/apps/switchboard-plugs/onlineaccounts/default.nix b/pkgs/desktops/pantheon/apps/switchboard-plugs/onlineaccounts/default.nix index a59ed798df55..4f7f9006acc5 100644 --- a/pkgs/desktops/pantheon/apps/switchboard-plugs/onlineaccounts/default.nix +++ b/pkgs/desktops/pantheon/apps/switchboard-plugs/onlineaccounts/default.nix @@ -17,13 +17,13 @@ stdenv.mkDerivation rec { pname = "switchboard-plug-onlineaccounts"; - version = "8.0.1"; + version = "8.0.2"; src = fetchFromGitHub { owner = "elementary"; - repo = pname; + repo = "settings-onlineaccounts"; rev = version; - sha256 = "sha256-E4UAhrs+YQ47VEHMFY8PbSFvBqhqrTf4aPezeqEjdLo="; + sha256 = "sha256-0dt4E2g1nX78s2WK2HO6P/fKjXcsR61KJSpulgsZHPI="; }; nativeBuildInputs = [ @@ -50,7 +50,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Switchboard Online Accounts Plug"; - homepage = "https://github.com/elementary/switchboard-plug-onlineaccounts"; + homepage = "https://github.com/elementary/settings-onlineaccounts"; license = licenses.gpl3Plus; platforms = platforms.linux; teams = [ teams.pantheon ]; diff --git a/pkgs/desktops/pantheon/desktop/elementary-shortcut-overlay/default.nix b/pkgs/desktops/pantheon/desktop/elementary-shortcut-overlay/default.nix index ce737ccdd4ae..cfd739884d67 100644 --- a/pkgs/desktops/pantheon/desktop/elementary-shortcut-overlay/default.nix +++ b/pkgs/desktops/pantheon/desktop/elementary-shortcut-overlay/default.nix @@ -16,18 +16,19 @@ granite7, libgee, mutter, + pantheon-wayland, wrapGAppsHook4, }: stdenv.mkDerivation rec { pname = "elementary-shortcut-overlay"; - version = "8.0.1"; + version = "8.1.0"; src = fetchFromGitHub { owner = "elementary"; repo = "shortcut-overlay"; rev = version; - sha256 = "sha256-RWFzs4rw/KC0MXkNfA178FejMbuIBh5FVox1RxmxCJA="; + sha256 = "sha256-oGExG7eWiZqXEPBRuLRTnbgo3hRVKo8vO51vMBPoQb0="; }; nativeBuildInputs = [ @@ -48,6 +49,7 @@ stdenv.mkDerivation rec { gtk4 libgee mutter # org.gnome.mutter.keybindings + pantheon-wayland ]; passthru = {