diff options
| author | Sandro <sandro.jaeckel@gmail.com> | 2022-03-27 20:15:50 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-03-27 20:15:50 +0200 |
| commit | 2522ff9c460958b178ac9fd1fad9cad5aac08976 (patch) | |
| tree | ff72271682e60c0ae06b146f6631f9fbb16054e0 | |
| parent | 4f9ef8f97478e66372254ae7ae12758c2b84a4d6 (diff) | |
| parent | 69c490670e58fa2d337d99a8503b46e2daf2aa5a (diff) | |
| download | nixpkgs-2522ff9c460958b178ac9fd1fad9cad5aac08976.tar nixpkgs-2522ff9c460958b178ac9fd1fad9cad5aac08976.tar.gz nixpkgs-2522ff9c460958b178ac9fd1fad9cad5aac08976.tar.bz2 nixpkgs-2522ff9c460958b178ac9fd1fad9cad5aac08976.tar.lz nixpkgs-2522ff9c460958b178ac9fd1fad9cad5aac08976.tar.xz nixpkgs-2522ff9c460958b178ac9fd1fad9cad5aac08976.tar.zst nixpkgs-2522ff9c460958b178ac9fd1fad9cad5aac08976.zip | |
Merge pull request #165742 from zhaofengli/phosh-0.16.0
| -rw-r--r-- | pkgs/applications/misc/phoc/default.nix | 10 | ||||
| -rw-r--r-- | pkgs/applications/window-managers/phosh/default.nix | 6 |
2 files changed, 10 insertions, 6 deletions
diff --git a/pkgs/applications/misc/phoc/default.nix b/pkgs/applications/misc/phoc/default.nix index e1dd464edbc..ee6c213fbf2 100644 --- a/pkgs/applications/misc/phoc/default.nix +++ b/pkgs/applications/misc/phoc/default.nix @@ -34,6 +34,12 @@ let url = "https://github.com/swaywm/wlroots/commit/66593071bc90a1cccaeedc636eb6f33c973f5362.patch"; sha256 = "sha256-yKf/twdUzrII5IakH7AH6LGyPDo9Nl/gIB0pTThSTfY="; }) + # xdg-activation: Allow to submit tokens + (fetchpatch { + name = "allow-to-submit-tokens.patch"; + url = "https://gitlab.freedesktop.org/wlroots/wlroots/-/commit/4c59f7d46a949548caa55805b00922f846d58525.patch"; + sha256 = "sha256-1kUIt6lV3HXN2BBBER8sjYVLTvgqELdSeFullJjNGo8="; + }) # xwayland: Allow to retrieve startup-id via _NET_STARTUP_INFO (fetchpatch { name = "allow-to-retrieve-startup-id-via-net-startup-info.patch"; @@ -44,7 +50,7 @@ let }); in stdenv.mkDerivation rec { pname = "phoc"; - version = "0.12.0"; + version = "0.13.0"; src = fetchFromGitLab { domain = "gitlab.gnome.org"; @@ -52,7 +58,7 @@ in stdenv.mkDerivation rec { owner = "Phosh"; repo = pname; rev = "v${version}"; - sha256 = "sha256-kfMM/YjgAktpOKHNcxxl1FPVbgATPDNRhEJ/sVT1LYs="; + sha256 = "sha256-65u59S6ntvkoQUO5BvkHZVcbj6cHIU4CgHWjzFo6s94="; }; nativeBuildInputs = [ diff --git a/pkgs/applications/window-managers/phosh/default.nix b/pkgs/applications/window-managers/phosh/default.nix index 90155fbca1f..77a65eef667 100644 --- a/pkgs/applications/window-managers/phosh/default.nix +++ b/pkgs/applications/window-managers/phosh/default.nix @@ -31,7 +31,7 @@ stdenv.mkDerivation rec { pname = "phosh"; - version = "0.15.0"; + version = "0.16.0"; src = fetchFromGitLab { domain = "gitlab.gnome.org"; @@ -40,7 +40,7 @@ stdenv.mkDerivation rec { repo = pname; rev = "v${version}"; fetchSubmodules = true; # including gvc and libcall-ui which are designated as subprojects - sha256 = "sha256-ZEfYjgSaj4vVdfgdIcg0PWwlFX90PIm5wvdn9P/8tvo="; + sha256 = "sha256-nxQYVWUXT1fNgOTRB3iWCLWYI/STk8vtguTbPPNTHdg="; }; nativeBuildInputs = [ @@ -109,8 +109,6 @@ stdenv.mkDerivation rec { postFixup = '' mkdir -p $out/share/wayland-sessions ln -s $out/share/applications/sm.puri.Phosh.desktop $out/share/wayland-sessions/ - # The OSK0.desktop points to a dummy stub that's not needed - rm $out/share/applications/sm.puri.OSK0.desktop ''; passthru = { |