diff options
| author | Sandro <sandro.jaeckel@gmail.com> | 2021-11-22 16:27:48 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-11-22 16:27:48 +0100 |
| commit | 9ad4e86627374e18be3d7cb790e76b2431f75040 (patch) | |
| tree | b107f4aaaf6b84fdfc633390ab94e60e8c120526 | |
| parent | 542206e00490153fc2c8d76014b802ce2e260369 (diff) | |
| parent | bf31f3d6c873fcc81671e5b8477803ea7782fbb3 (diff) | |
| download | nixpkgs-9ad4e86627374e18be3d7cb790e76b2431f75040.tar nixpkgs-9ad4e86627374e18be3d7cb790e76b2431f75040.tar.gz nixpkgs-9ad4e86627374e18be3d7cb790e76b2431f75040.tar.bz2 nixpkgs-9ad4e86627374e18be3d7cb790e76b2431f75040.tar.lz nixpkgs-9ad4e86627374e18be3d7cb790e76b2431f75040.tar.xz nixpkgs-9ad4e86627374e18be3d7cb790e76b2431f75040.tar.zst nixpkgs-9ad4e86627374e18be3d7cb790e76b2431f75040.zip | |
Merge pull request #143726 from zhaofengli/phosh-0.14.0
| -rw-r--r-- | pkgs/applications/misc/phoc/default.nix | 17 | ||||
| -rw-r--r-- | pkgs/applications/window-managers/phosh/default.nix | 4 |
2 files changed, 17 insertions, 4 deletions
diff --git a/pkgs/applications/misc/phoc/default.nix b/pkgs/applications/misc/phoc/default.nix index 97613b21957..1a590af9465 100644 --- a/pkgs/applications/misc/phoc/default.nix +++ b/pkgs/applications/misc/phoc/default.nix @@ -32,11 +32,24 @@ let url = "https://github.com/swaywm/wlroots/commit/e18599b05e0f0cbeba11adbd489e801285470eab.patch"; sha256 = "17ax4dyk0584yhs3lq8ija5bkainjf7psx9c9r50cr4jm9c0i37l"; }) + + # xwayland: Allow to retrieve _NET_STARTUP_ID + (fetchpatch { + name = "allow-to-retrieve-net-startup-id.patch"; + url = "https://github.com/swaywm/wlroots/commit/66593071bc90a1cccaeedc636eb6f33c973f5362.patch"; + sha256 = "sha256-yKf/twdUzrII5IakH7AH6LGyPDo9Nl/gIB0pTThSTfY="; + }) + # xwayland: Allow to retrieve startup-id via _NET_STARTUP_INFO + (fetchpatch { + name = "allow-to-retrieve-startup-id-via-net-startup-info.patch"; + url = "https://github.com/swaywm/wlroots/commit/235bb6f2fcb8ee4174215ba74b5bc2f191c5960a.patch"; + sha256 = "sha256-7AWBq12tF/781CmgvTaOvTIiiJMywxRn6eWp+jacdak="; + }) ]; }); in stdenv.mkDerivation rec { pname = "phoc"; - version = "0.8.0"; + version = "0.9.0"; src = fetchFromGitLab { domain = "gitlab.gnome.org"; @@ -44,7 +57,7 @@ in stdenv.mkDerivation rec { owner = "Phosh"; repo = pname; rev = "v${version}"; - sha256 = "sha256-QAnJlpFjWJvwxGyenmN4IaI9VFn2jwdXpa8VqAmH7Xw="; + sha256 = "sha256-qd1ZETM2/AjU5nKQIqh0Q+SboLNr+NncvSHgLv2S3KI="; }; nativeBuildInputs = [ diff --git a/pkgs/applications/window-managers/phosh/default.nix b/pkgs/applications/window-managers/phosh/default.nix index 0a16bfc8842..2971bdeb57c 100644 --- a/pkgs/applications/window-managers/phosh/default.nix +++ b/pkgs/applications/window-managers/phosh/default.nix @@ -30,7 +30,7 @@ stdenv.mkDerivation rec { pname = "phosh"; - version = "0.13.1"; + version = "0.14.0"; src = fetchFromGitLab { domain = "gitlab.gnome.org"; @@ -39,7 +39,7 @@ stdenv.mkDerivation rec { repo = pname; rev = "v${version}"; fetchSubmodules = true; # including gvc and libcall-ui which are designated as subprojects - sha256 = "sha256-dKQK4mGe/dvNlca/XMDeq1Q4dH/WBF/rtiUh8RssF5c="; + sha256 = "sha256-pN2IWJDsQoTSOUki5gKhIucFYlYchzrqKHQYq6o4EkI="; }; nativeBuildInputs = [ |