diff options
author | Michael Weiss <dev.primeos@gmail.com> | 2020-03-10 16:25:41 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2020-03-10 16:25:41 +0100 |
commit | 1be9d1e8b038bbe14bd7fe276108eb902263ca66 (patch) | |
tree | d410aa9f60b21b7ed04f668144fd3ea35ae7c158 /pkgs/development/libraries | |
parent | e05e219b3142ed4b4176d99b63c525645b3b8f7d (diff) | |
parent | e929b8af46937627756c0a3a44fa0dbd6b7450c2 (diff) | |
download | nixlib-1be9d1e8b038bbe14bd7fe276108eb902263ca66.tar nixlib-1be9d1e8b038bbe14bd7fe276108eb902263ca66.tar.gz nixlib-1be9d1e8b038bbe14bd7fe276108eb902263ca66.tar.bz2 nixlib-1be9d1e8b038bbe14bd7fe276108eb902263ca66.tar.lz nixlib-1be9d1e8b038bbe14bd7fe276108eb902263ca66.tar.xz nixlib-1be9d1e8b038bbe14bd7fe276108eb902263ca66.tar.zst nixlib-1be9d1e8b038bbe14bd7fe276108eb902263ca66.zip |
Merge pull request #82251 from primeos/wlroots
wlroots: 0.10.0 -> 0.10.1
Diffstat (limited to 'pkgs/development/libraries')
-rw-r--r-- | pkgs/development/libraries/wlroots/default.nix | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/pkgs/development/libraries/wlroots/default.nix b/pkgs/development/libraries/wlroots/default.nix index 9f9c4acb0d85..104e0c3440aa 100644 --- a/pkgs/development/libraries/wlroots/default.nix +++ b/pkgs/development/libraries/wlroots/default.nix @@ -1,36 +1,31 @@ -{ stdenv, fetchFromGitHub, meson, ninja, pkgconfig, fetchpatch -, wayland, libGL, wayland-protocols, libinput, libxkbcommon, pixman +{ stdenv, fetchFromGitHub, meson, ninja, pkg-config, wayland +, libGL, wayland-protocols, libinput, libxkbcommon, pixman , xcbutilwm, libX11, libcap, xcbutilimage, xcbutilerrors, mesa , libpng, ffmpeg_4 }: stdenv.mkDerivation rec { pname = "wlroots"; - version = "0.10.0"; + version = "0.10.1"; src = fetchFromGitHub { owner = "swaywm"; repo = "wlroots"; rev = version; - sha256 = "0c0q1p9yss5kx4430ik3n89drqpmm2bvgl8fjlf6prac1a7xzqn8"; + sha256 = "0j2lh9vc92zhn44rjbia5aw3y1rpgfng1x1h17lcvj5m4i6vj0pc"; }; # $out for the library and $examples for the example programs (in examples): outputs = [ "out" "examples" ]; - nativeBuildInputs = [ meson ninja pkgconfig ]; + nativeBuildInputs = [ meson ninja pkg-config wayland ]; buildInputs = [ - wayland libGL wayland-protocols libinput libxkbcommon pixman + libGL wayland-protocols libinput libxkbcommon pixman xcbutilwm libX11 libcap xcbutilimage xcbutilerrors mesa libpng ffmpeg_4 ]; - mesonFlags = [ - "-Dlibcap=enabled" "-Dlogind=enabled" "-Dxwayland=enabled" "-Dx11-backend=enabled" - "-Dxcb-icccm=enabled" "-Dxcb-errors=enabled" - ]; - postInstall = '' # Copy the library to $examples mkdir -p $examples/lib @@ -51,7 +46,12 @@ stdenv.mkDerivation rec { meta = with stdenv.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 ]; |