wlroots: 0.10.0 -> 0.10.1

I also added some minor improvements and removed unnecessary code.
This commit is contained in:
Michael Weiss 2020-03-10 15:33:00 +01:00
parent 320334aee7
commit e929b8af46
No known key found for this signature in database
GPG Key ID: 5BE487C4D4771D83

View File

@ -1,36 +1,31 @@
{ stdenv, fetchFromGitHub, meson, ninja, pkgconfig, fetchpatch { stdenv, fetchFromGitHub, meson, ninja, pkg-config, wayland
, wayland, libGL, wayland-protocols, libinput, libxkbcommon, pixman , libGL, wayland-protocols, libinput, libxkbcommon, pixman
, xcbutilwm, libX11, libcap, xcbutilimage, xcbutilerrors, mesa , xcbutilwm, libX11, libcap, xcbutilimage, xcbutilerrors, mesa
, libpng, ffmpeg_4 , libpng, ffmpeg_4
}: }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "wlroots"; pname = "wlroots";
version = "0.10.0"; version = "0.10.1";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "swaywm"; owner = "swaywm";
repo = "wlroots"; repo = "wlroots";
rev = version; rev = version;
sha256 = "0c0q1p9yss5kx4430ik3n89drqpmm2bvgl8fjlf6prac1a7xzqn8"; sha256 = "0j2lh9vc92zhn44rjbia5aw3y1rpgfng1x1h17lcvj5m4i6vj0pc";
}; };
# $out for the library and $examples for the example programs (in examples): # $out for the library and $examples for the example programs (in examples):
outputs = [ "out" "examples" ]; outputs = [ "out" "examples" ];
nativeBuildInputs = [ meson ninja pkgconfig ]; nativeBuildInputs = [ meson ninja pkg-config wayland ];
buildInputs = [ buildInputs = [
wayland libGL wayland-protocols libinput libxkbcommon pixman libGL wayland-protocols libinput libxkbcommon pixman
xcbutilwm libX11 libcap xcbutilimage xcbutilerrors mesa xcbutilwm libX11 libcap xcbutilimage xcbutilerrors mesa
libpng ffmpeg_4 libpng ffmpeg_4
]; ];
mesonFlags = [
"-Dlibcap=enabled" "-Dlogind=enabled" "-Dxwayland=enabled" "-Dx11-backend=enabled"
"-Dxcb-icccm=enabled" "-Dxcb-errors=enabled"
];
postInstall = '' postInstall = ''
# Copy the library to $examples # Copy the library to $examples
mkdir -p $examples/lib mkdir -p $examples/lib
@ -51,7 +46,12 @@ stdenv.mkDerivation rec {
meta = with stdenv.lib; { meta = with stdenv.lib; {
description = "A modular Wayland compositor library"; 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; inherit (src.meta) homepage;
changelog = "https://github.com/swaywm/wlroots/releases/tag/${version}";
license = licenses.mit; license = licenses.mit;
platforms = platforms.linux; platforms = platforms.linux;
maintainers = with maintainers; [ primeos ]; maintainers = with maintainers; [ primeos ];