JakeHillion/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

phoc: 0.9.0 -> 0.11.0

Browse Source 
We can finally drop wlroots_0_12! On the other hand, we now need to keep
wlroots_0_14 when 0.15 gets merged :P

Removing archseer from maintainers per request: https://github.com/NixOS/nixpkgs/pull/143785#issuecomment-955873911
This commit is contained in:
Zhaofeng Li 2021-12-20 21:24:30 -08:00
parent f7fba6ae71
commit 84595758cc
2 changed files with 4 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
pkgs/applications/misc/phoc/default.nix
View File

@ -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 {
@ -49,7 +43,7 @@ let
});
in stdenv.mkDerivation rec {
pname = "phoc";
version = "0.9.0";
version = "0.11.0";
src = fetchFromGitLab {
domain = "gitlab.gnome.org";
@ -57,7 +51,7 @@ in stdenv.mkDerivation rec {
owner = "Phosh";
repo = pname;
rev = "v${version}";
sha256 = "sha256-qd1ZETM2/AjU5nKQIqh0Q+SboLNr+NncvSHgLv2S3KI=";
sha256 = "sha256-oUZtJzclVRSbLG3flF3ryLuvp1kPUtYNsmCG0csSC2A=";
};
nativeBuildInputs = [
@ -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;
};
}

2
pkgs/top-level/all-packages.nix
View File

@ -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 { };