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

phoc: 0.13.0 -> 0.21.0

Browse source
This commit is contained in:
Tom Fitzhenry 2022-07-30 14:30:36 +10:00
parent f83a329eb1
commit 20727e2ba2
3 changed files with 36 additions and 22 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
pkgs/applications/misc/phoc/0001-handle-outputs-that-arent-in-the-layout.patch Normal file
View file

@ -0,0 +1,14 @@
diff --git a/types/wlr_output_layout.c b/types/wlr_output_layout.c
index eb672f06..f0f546da 100644
--- a/types/wlr_output_layout.c
+++ b/types/wlr_output_layout.c
@@ -242,6 +242,9 @@ bool wlr_output_layout_contains_point(struct wlr_output_layout *layout,
if (reference) {
struct wlr_output_layout_output *l_output =
wlr_output_layout_get(layout, reference);
+ if (!l_output) {
+ return false;
+ }
struct wlr_box *box = output_layout_output_get_box(l_output);
return wlr_box_contains_point(box, lx, ly);
} else {

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

@ -21,36 +21,38 @@
let
phocWlroots = wlroots.overrideAttrs (old: {
patches = (old.patches or []) ++ [
# Temporary fix. Upstream report: https://source.puri.sm/Librem5/phosh/-/issues/422
# Revert "layer-shell: error on 0 dimension without anchors"
# https://source.puri.sm/Librem5/phosh/-/issues/422
(fetchpatch {
name = "0001-Revert-layer-shell-error-on-0-dimension-without-anch.patch";
url = "https://gitlab.alpinelinux.org/alpine/aports/-/raw/78fde4aaf1a74eb13a3f083cb6dfb29f578c3265/community/wlroots/0001-Revert-layer-shell-error-on-0-dimension-without-anch.patch";
sha256 = "1zjn7mwdj21z0jsc2mz90cnrzk97yqkiq58qqgpjav4h4dgpfb38";
url = "https://source.puri.sm/Librem5/wlroots/-/commit/4f66b0931aaaee65367102e9c4ccb736097412c7.patch";
hash = "sha256-2Vy5a4lWh8FP2PN6xRIZv6IlUuLZibT0MYW+EyvVULs=";
})
# xwayland: Allow to retrieve _NET_STARTUP_ID
# xdg-activation: Deduplicate token creation code
(fetchpatch {
name = "allow-to-retrieve-net-startup-id.patch";
url = "https://github.com/swaywm/wlroots/commit/66593071bc90a1cccaeedc636eb6f33c973f5362.patch";
sha256 = "sha256-yKf/twdUzrII5IakH7AH6LGyPDo9Nl/gIB0pTThSTfY=";
name = "xdg-activation-deduplicate-token-creation-code.patch";
url = "https://gitlab.freedesktop.org/wlroots/wlroots/-/commit/dd03d839ab56c3e5d7c607a8d76e58e0b75edb85.patch";
sha256 = "sha256-mxt68MISC24xpaBtVSc1F2W4cyNs5wQowtbUQH9Eqr8=";
})
# xdg-activation: Allow to submit tokens
# seat: Allow to cancel touches
(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";
url = "https://github.com/swaywm/wlroots/commit/235bb6f2fcb8ee4174215ba74b5bc2f191c5960a.patch";
sha256 = "sha256-7AWBq12tF/781CmgvTaOvTIiiJMywxRn6eWp+jacdak=";
name = "seat-Allow-to-cancel-touches.patch";
url = "https://gitlab.freedesktop.org/wlroots/wlroots/-/commit/17b2b06633729f1826715c1d0b84614aa3cedb3a.patch";
sha256 = "sha256-BAeXa3ZB5TXnlq0ZP2+rZlVXEPWpLP4Wi4TLwoXjkz4=";
})
# From
# https://gitlab.freedesktop.org/wlroots/wlroots/-/commit/13fcdba75cf5f21cfd49c1a05f4fa62f77619b40
# which has been merged upstream, but doesn't cleanly apply on to the
# latest released version.
./0001-handle-outputs-that-arent-in-the-layout.patch
];
});
in stdenv.mkDerivation rec {
pname = "phoc";
version = "0.13.0";
version = "0.21.0";
src = fetchFromGitLab {
domain = "gitlab.gnome.org";
@ -58,7 +60,7 @@ in stdenv.mkDerivation rec {
owner = "Phosh";
repo = pname;
rev = "v${version}";
sha256 = "sha256-65u59S6ntvkoQUO5BvkHZVcbj6cHIU4CgHWjzFo6s94=";
sha256 = "sha256-NSRdzOfdKrHlTa+YzUFw28HzRvbQuXRo8XdMeWgZUbg=";
};
nativeBuildInputs = [

4
pkgs/top-level/all-packages.nix
View file

@ -9885,9 +9885,7 @@ with pkgs;
pfstools = libsForQt5.callPackage ../tools/graphics/pfstools { };
phoc = callPackage ../applications/misc/phoc {
wlroots = wlroots_0_14;
};
phoc = callPackage ../applications/misc/phoc { };
phockup = callPackage ../applications/misc/phockup { };