Skip to content

phoc: 0.9.0 -> 0.11.0, wlroots_0_12: drop #151519

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
primeos merged 2 commits into from
Jan 10, 2022
Merged

phoc: 0.9.0 -> 0.11.0, wlroots_0_12: drop #151519

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
8459575
phoc: 0.9.0 -> 0.11.0
zhaofengli Dec 21, 2021
4ea6bfa
wlroots_0_12: drop
zhaofengli Dec 21, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 3 additions & 9 deletions pkgs/applications/misc/phoc/default.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,12 +26,6 @@ let
url = "https://gitlab.alpinelinux.org/alpine/aports/-/raw/78fde4aaf1a74eb13a3f083cb6dfb29f578c3265/community/wlroots/0001-Revert-layer-shell-error-on-0-dimension-without-anch.patch";
sha256 = "1zjn7mwdj21z0jsc2mz90cnrzk97yqkiq58qqgpjav4h4dgpfb38";
})
# To fix missing header `EGL/eglmesaext.h` dropped upstream
(fetchpatch {
name = "0002-stop-including-eglmesaext-h.patch";
url = "https://github.com/swaywm/wlroots/commit/e18599b05e0f0cbeba11adbd489e801285470eab.patch";
sha256 = "17ax4dyk0584yhs3lq8ija5bkainjf7psx9c9r50cr4jm9c0i37l";
})

# xwayland: Allow to retrieve _NET_STARTUP_ID
(fetchpatch {
Expand All @@ -49,15 +43,15 @@ let
});
in stdenv.mkDerivation rec {
pname = "phoc";
version = "0.9.0";
version = "0.11.0";

src = fetchFromGitLab {
domain = "gitlab.gnome.org";
group = "World";
owner = "Phosh";
repo = pname;
rev = "v${version}";
sha256 = "sha256-qd1ZETM2/AjU5nKQIqh0Q+SboLNr+NncvSHgLv2S3KI=";
sha256 = "sha256-oUZtJzclVRSbLG3flF3ryLuvp1kPUtYNsmCG0csSC2A=";
};

nativeBuildInputs = [
Expand Down Expand Up @@ -92,7 +86,7 @@ in stdenv.mkDerivation rec {
description = "Wayland compositor for mobile phones like the Librem 5";
homepage = "https://gitlab.gnome.org/World/Phosh/phoc";
license = licenses.gpl3Plus;
maintainers = with maintainers; [ archseer masipcat zhaofengli ];
maintainers = with maintainers; [ masipcat zhaofengli ];
platforms = platforms.linux;
};
}
59 changes: 0 additions & 59 deletions pkgs/development/libraries/wlroots/0.12.nix
View file
Open in desktop

This file was deleted.

3 changes: 1 addition & 2 deletions pkgs/top-level/all-packages.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8737,7 +8737,7 @@ with pkgs;
philter = callPackage ../tools/networking/philter { };

phoc = callPackage ../applications/misc/phoc {
wlroots = wlroots_0_12;
wlroots = wlroots_0_14;
};

phodav = callPackage ../tools/networking/phodav { };
Expand Down Expand Up @@ -26192,7 +26192,6 @@ with pkgs;
};

wlroots = wlroots_0_15;
wlroots_0_12 = callPackage ../development/libraries/wlroots/0.12.nix {};
wlroots_0_14 = callPackage ../development/libraries/wlroots/0.14.nix {
inherit (xorg) xcbutilrenderutil;
};
Expand Down