cafkafk/nixpkgs
cafkafk/nixpkgs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 2

Merge pull request #165742 from zhaofengli/phosh-0.16.0

Browse source
This commit is contained in:
Sandro 2022-03-27 20:15:50 +02:00 committed by GitHub
commit 2522ff9c46
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 10 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
pkgs/applications/misc/phoc/default.nix
View file

@ -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 = [

6
pkgs/applications/window-managers/phosh/default.nix
View file

@ -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 = {