Merge pull request #151519 from zhaofengli/phoc-0.11.0
phoc: 0.9.0 -> 0.11.0, wlroots_0_12: drop
This commit is contained in:
commit
f0c39f6d83
3 changed files with 4 additions and 70 deletions
|
@ -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;
|
||||
};
|
||||
}
|
||||
|
|
|
@ -1,59 +0,0 @@
|
|||
{ lib, stdenv, fetchFromGitHub, meson, ninja, pkg-config, wayland
|
||||
, libGL, wayland-protocols, libinput, libxkbcommon, pixman
|
||||
, xcbutilwm, libX11, libcap, xcbutilimage, xcbutilerrors, mesa
|
||||
, libpng, ffmpeg
|
||||
}:
|
||||
|
||||
# Fixed version derivation.
|
||||
# nixpkgs-update: no auto update
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "wlroots";
|
||||
version = "0.12.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "swaywm";
|
||||
repo = "wlroots";
|
||||
rev = version;
|
||||
sha256 = "01j38lmgs2c6fq68v8b75pkilia2wsgzgp46ivfbi9hhx47kgcfn";
|
||||
};
|
||||
|
||||
# $out for the library and $examples for the example programs (in examples):
|
||||
outputs = [ "out" "examples" ];
|
||||
|
||||
nativeBuildInputs = [ meson ninja pkg-config wayland ];
|
||||
|
||||
buildInputs = [
|
||||
libGL wayland wayland-protocols libinput libxkbcommon pixman
|
||||
xcbutilwm libX11 libcap xcbutilimage xcbutilerrors mesa
|
||||
libpng ffmpeg
|
||||
];
|
||||
|
||||
mesonFlags = [ "-Dlogind-provider=systemd" "-Dlibseat=disabled" ];
|
||||
|
||||
CFLAGS = "-Wno-error=deprecated-declarations";
|
||||
|
||||
postFixup = ''
|
||||
# Install ALL example programs to $examples:
|
||||
# screencopy dmabuf-capture input-inhibitor layer-shell idle-inhibit idle
|
||||
# screenshot output-layout multi-pointer rotation tablet touch pointer
|
||||
# simple
|
||||
mkdir -p $examples/bin
|
||||
cd ./examples
|
||||
for binary in $(find . -executable -type f -printf '%P\n' | grep -vE '\.so'); do
|
||||
cp "$binary" "$examples/bin/wlroots-$binary"
|
||||
done
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
description = "A modular Wayland compositor library";
|
||||
longDescription = ''
|
||||
Pluggable, composable, unopinionated modules for building a Wayland
|
||||
compositor; or about 50,000 lines of code you were going to write anyway.
|
||||
'';
|
||||
inherit (src.meta) homepage;
|
||||
changelog = "https://github.com/swaywm/wlroots/releases/tag/${version}";
|
||||
license = licenses.mit;
|
||||
platforms = platforms.linux;
|
||||
maintainers = with maintainers; [ primeos synthetica ];
|
||||
};
|
||||
}
|
|
@ -8684,7 +8684,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 { };
|
||||
|
@ -26127,7 +26127,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;
|
||||
};
|
||||
|
|
Loading…
Reference in a new issue