From 54dcd76205745730f2c911a179bc3d1befd8f389 Mon Sep 17 00:00:00 2001 From: rewine Date: Tue, 2 Jan 2024 16:56:19 +0800 Subject: [PATCH] wlroots_0_17: don't pin on ffmpeg_4 --- pkgs/development/libraries/wlroots/default.nix | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/pkgs/development/libraries/wlroots/default.nix b/pkgs/development/libraries/wlroots/default.nix index f2a469b5ce0e..e9265de54c61 100644 --- a/pkgs/development/libraries/wlroots/default.nix +++ b/pkgs/development/libraries/wlroots/default.nix @@ -17,6 +17,7 @@ , xorg , libpng , ffmpeg_4 +, ffmpeg , hwdata , seatd , vulkan-loader @@ -57,7 +58,6 @@ let ++ extraNativeBuildInputs; buildInputs = [ - ffmpeg_4 libGL libcap libinput @@ -116,6 +116,9 @@ rec { wlroots_0_15 = generic { version = "0.15.1"; hash = "sha256-MFR38UuB/wW7J9ODDUOfgTzKLse0SSMIRYTpEaEdRwM="; + extraBuildInputs = [ + ffmpeg_4 + ]; }; wlroots_0_16 = generic { @@ -125,12 +128,16 @@ rec { substituteInPlace backend/drm/meson.build \ --replace /usr/share/hwdata/ ${hwdata}/share/hwdata/ ''; + extraBuildInputs = [ + ffmpeg_4 + ]; }; wlroots_0_17 = generic { version = "0.17.1"; hash = "sha256-Z0gWM7AQqJOSr2maUtjdgk/MF6pyeyFMMTaivgt+RMI="; extraBuildInputs = [ + ffmpeg hwdata libliftoff libdisplay-info