diff options
| author | Bobby Rong <rjl931189261@126.com> | 2023-06-27 22:20:54 +0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-06-27 22:20:54 +0800 |
| commit | 1fab0a6526d0be9e091f18b9d4ace330a726a45e (patch) | |
| tree | e3c111a0a392712828de3c390012f1ef63de1e09 /pkgs/desktops | |
| parent | 5d9ae0d42e64132580ae7d28a71a0cf240ceaf12 (diff) | |
| parent | feebb5e434b01d7ba39b57bf28098c996ecae1a4 (diff) | |
| download | nixlib-1fab0a6526d0be9e091f18b9d4ace330a726a45e.tar nixlib-1fab0a6526d0be9e091f18b9d4ace330a726a45e.tar.gz nixlib-1fab0a6526d0be9e091f18b9d4ace330a726a45e.tar.bz2 nixlib-1fab0a6526d0be9e091f18b9d4ace330a726a45e.tar.lz nixlib-1fab0a6526d0be9e091f18b9d4ace330a726a45e.tar.xz nixlib-1fab0a6526d0be9e091f18b9d4ace330a726a45e.tar.zst nixlib-1fab0a6526d0be9e091f18b9d4ace330a726a45e.zip | |
Merge pull request #240077 from bobby285271/upd/pantheon
Pantheon updates 2023-06-27
Diffstat (limited to 'pkgs/desktops')
3 files changed, 10 insertions, 12 deletions
diff --git a/pkgs/desktops/pantheon/apps/switchboard-plugs/applications/default.nix b/pkgs/desktops/pantheon/apps/switchboard-plugs/applications/default.nix index 776e027cbfff..2f904768f66d 100644 --- a/pkgs/desktops/pantheon/apps/switchboard-plugs/applications/default.nix +++ b/pkgs/desktops/pantheon/apps/switchboard-plugs/applications/default.nix @@ -7,6 +7,7 @@ , pkg-config , vala , libgee +, libhandy , granite , gtk3 , switchboard @@ -15,13 +16,13 @@ stdenv.mkDerivation rec { pname = "switchboard-plug-applications"; - version = "6.0.1"; + version = "7.0.0"; src = fetchFromGitHub { owner = "elementary"; repo = pname; rev = version; - sha256 = "18izmzhqp6x5ivha9yl8gyz9adyrsylw7w5p0cwm1bndgqbi7yh5"; + sha256 = "sha256-M9JMrxhMiDC/qrrnPaBm6Kf3CAkxrhGWwJF8jVm2G5c="; }; nativeBuildInputs = [ @@ -36,6 +37,7 @@ stdenv.mkDerivation rec { granite gtk3 libgee + libhandy switchboard ]; diff --git a/pkgs/desktops/pantheon/desktop/gala/default.nix b/pkgs/desktops/pantheon/desktop/gala/default.nix index ab54f127f7bb..d9bec11e0da4 100644 --- a/pkgs/desktops/pantheon/desktop/gala/default.nix +++ b/pkgs/desktops/pantheon/desktop/gala/default.nix @@ -21,17 +21,18 @@ , gnome-settings-daemon , wrapGAppsHook , gexiv2 +, systemd }: stdenv.mkDerivation rec { pname = "gala"; - version = "7.0.3"; + version = "7.1.0"; src = fetchFromGitHub { owner = "elementary"; repo = pname; rev = version; - sha256 = "sha256-RLKPYDWVqT2WfjLPXRFPCNNvcW+fJ0OUKjSLLgPBqdw="; + sha256 = "sha256-x0EIah/iTluJk7P3k0g23cQldx++W58FbjnHNlF31AQ="; }; patches = [ @@ -63,12 +64,7 @@ stdenv.mkDerivation rec { libgee mesa # for libEGL mutter - ]; - - mesonFlags = [ - # TODO: enable this and remove --builtin flag from session-settings - # https://github.com/NixOS/nixpkgs/pull/140429 - "-Dsystemd=false" + systemd ]; postPatch = '' 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 8be2adad40f4..51e0737cfe81 100644 --- a/pkgs/desktops/pantheon/services/xdg-desktop-portal-pantheon/default.nix +++ b/pkgs/desktops/pantheon/services/xdg-desktop-portal-pantheon/default.nix @@ -16,13 +16,13 @@ stdenv.mkDerivation rec { pname = "xdg-desktop-portal-pantheon"; - version = "7.0.0"; + version = "7.1.0"; src = fetchFromGitHub { owner = "elementary"; repo = "portals"; rev = version; - sha256 = "sha256-Rfo9Z5rCJgk36Db3ce8dYBJswy8owjvRMrJVB/RfwyI="; + sha256 = "sha256-uy/etQiJuaROw8bWg2PUdptNr4I8uqqUZ8BWK6D2bog="; }; nativeBuildInputs = [ |