diff options
Diffstat (limited to 'pkgs/development/libraries/wlroots/0.15.nix')
| -rw-r--r-- | pkgs/development/libraries/wlroots/0.15.nix | 16 |
1 files changed, 10 insertions, 6 deletions
diff --git a/pkgs/development/libraries/wlroots/0.15.nix b/pkgs/development/libraries/wlroots/0.15.nix index 93ecf0bd3ab3b..ed3effaa54055 100644 --- a/pkgs/development/libraries/wlroots/0.15.nix +++ b/pkgs/development/libraries/wlroots/0.15.nix @@ -1,21 +1,22 @@ -{ lib, stdenv, fetchFromGitLab, meson_0_60, ninja, pkg-config, wayland-scanner +{ lib, stdenv, fetchFromGitLab, meson, ninja, pkg-config, wayland-scanner , libGL, wayland, wayland-protocols, libinput, libxkbcommon, pixman , xcbutilwm, libX11, libcap, xcbutilimage, xcbutilerrors, mesa -, libpng, ffmpeg, xcbutilrenderutil, seatd, vulkan-loader, glslang +, libpng, ffmpeg_4, xcbutilrenderutil, seatd, vulkan-loader, glslang +, nixosTests , enableXWayland ? true, xwayland ? null }: stdenv.mkDerivation rec { pname = "wlroots"; - version = "0.15.0"; + version = "0.15.1"; src = fetchFromGitLab { domain = "gitlab.freedesktop.org"; owner = "wlroots"; repo = "wlroots"; rev = version; - sha256 = "0wdzs0wpv61pxgy3mx3xjsndyfmbj30v47d3w9ymmnd4r479n41n"; + sha256 = "sha256-MFR38UuB/wW7J9ODDUOfgTzKLse0SSMIRYTpEaEdRwM="; }; # $out for the library and $examples for the example programs (in examples): @@ -23,12 +24,12 @@ stdenv.mkDerivation rec { depsBuildBuild = [ pkg-config ]; - nativeBuildInputs = [ meson_0_60 ninja pkg-config wayland-scanner ]; + nativeBuildInputs = [ meson ninja pkg-config wayland-scanner glslang ]; buildInputs = [ libGL wayland wayland-protocols libinput libxkbcommon pixman xcbutilwm libX11 libcap xcbutilimage xcbutilerrors mesa - libpng ffmpeg xcbutilrenderutil seatd vulkan-loader glslang + libpng ffmpeg_4 xcbutilrenderutil seatd vulkan-loader ] ++ lib.optional enableXWayland xwayland ; @@ -49,6 +50,9 @@ stdenv.mkDerivation rec { done ''; + # Test via TinyWL (the "minimum viable product" Wayland compositor based on wlroots): + passthru.tests.tinywl = nixosTests.tinywl; + meta = with lib; { description = "A modular Wayland compositor library"; longDescription = '' |