wlroots: revert to upstream

1 files changed, 13 insertions, 18 deletions

diff --git a/nixpkgs/pkgs/development/libraries/wlroots/default.nix b/nixpkgs/pkgs/development/libraries/wlroots/default.nix
index 800f3e7ac1b4..b85616842ea6 100644
--- a/nixpkgs/pkgs/development/libraries/wlroots/default.nix
+++ b/nixpkgs/pkgs/development/libraries/wlroots/default.nix
@@ -1,10 +1,7 @@
-{ stdenv, lib, fetchFromGitHub, meson, ninja, pkgconfig
-, wayland, libGL, wayland-protocols, libinput, libxkbcommon, pixman, mesa
-
-, libcapSupport ? true, libcap
-, x11Support ? true, libX11
-, xcbIcccmSupport ? x11Support, xcbutilwm
-, xcbErrorsSupport ? x11Support, xcbutilerrors
+{ stdenv, fetchFromGitHub, meson, ninja, pkgconfig
+, wayland, libGL, wayland-protocols, libinput, libxkbcommon, pixman
+, xcbutilwm, libX11, libcap, xcbutilimage, xcbutilerrors, mesa
+, libpng, ffmpeg_4, freerdp
 }:
 
 stdenv.mkDerivation rec {
@@ -25,17 +22,15 @@ stdenv.mkDerivation rec {
   nativeBuildInputs = [ meson ninja pkgconfig ];
 
   buildInputs = [
-    wayland libGL wayland-protocols libinput libxkbcommon pixman mesa
-  ] ++ lib.optional libcapSupport libcap
-    ++ lib.optional x11Support libX11
-    ++ lib.optional xcbErrorsSupport xcbutilerrors
-    ++ lib.optional xcbIcccmSupport xcbutilwm;
+    wayland libGL wayland-protocols libinput libxkbcommon pixman
+    xcbutilwm libX11 libcap xcbutilimage xcbutilerrors mesa
+    libpng ffmpeg_4 freerdp
+  ];
 
-  mesonFlags = [ "-Dlogind=enabled" ]
-    ++ lib.optional libcapSupport "-Dlibcap=enabled"
-    ++ lib.optionals x11Support [ "-Dxwayland=enabled" "-Dx11-backend=enabled" ]
-    ++ lib.optional xcbErrorsSupport "-Dxcb-errors=enabled"
-    ++ lib.optional xcbIcccmSupport  "-Dxcb-icccm=enabled";
+  mesonFlags = [
+    "-Dlibcap=enabled" "-Dlogind=enabled" "-Dxwayland=enabled" "-Dx11-backend=enabled"
+    "-Dxcb-icccm=enabled" "-Dxcb-errors=enabled"
+  ];
 
   postPatch = ''
     # It happens from time to time that the version wasn't updated:
@@ -76,7 +71,7 @@ stdenv.mkDerivation rec {
     done
   '';
 
-  meta = with lib; {
+  meta = with stdenv.lib; {
     description = "A modular Wayland compositor library";
     inherit (src.meta) homepage;
     license     = licenses.mit;