From 9051172e3e08a06e36f933e7eeaa0a19c50e864a Mon Sep 17 00:00:00 2001 From: Emily Date: Fri, 12 Jul 2024 14:07:21 +0100 Subject: [PATCH] wl-screenrec: 0.1.3 -> 0.1.4-unstable-2024-07-28 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Includes support for FFmpeg 7. We can’t use the release tag because of a Cargo build issue; see . Hopefully there’ll be a new release tag soon. Diff: --- pkgs/tools/wayland/wl-screenrec/default.nix | 12 ++++++------ pkgs/top-level/all-packages.nix | 4 +--- 2 files changed, 7 insertions(+), 9 deletions(-) diff --git a/pkgs/tools/wayland/wl-screenrec/default.nix b/pkgs/tools/wayland/wl-screenrec/default.nix index 2836d7fed2bb7..2ffdbf95de1aa 100644 --- a/pkgs/tools/wayland/wl-screenrec/default.nix +++ b/pkgs/tools/wayland/wl-screenrec/default.nix @@ -3,22 +3,22 @@ , fetchFromGitHub , pkg-config , libdrm -, ffmpeg +, ffmpeg_7 , wayland }: rustPlatform.buildRustPackage rec { pname = "wl-screenrec"; - version = "0.1.3"; + version = "0.1.4-unstable-2024-07-28"; src = fetchFromGitHub { owner = "russelltg"; repo = pname; - rev = "v${version}"; - hash = "sha256-ThPZPV1GyMFRu94O9WwUpXbR4gnIML26K7TyIfXZlcI="; + rev = "b817accf1d4f2373cb6f466f760de35e5b8626bd"; + hash = "sha256-07O2YM9dOHWzriM2+uiBWjEt2hKAuXtRtnKBuzb02Us="; }; - cargoHash = "sha256-DtlVsUFKNKXcwqNvGvqkSKUE+kRHX8wajL4fR0c9ZuQ="; + cargoHash = "sha256-AYirjrnk8SGTXk5IjzCep2AQJYPbgHAOOf47MUDYj4k="; nativeBuildInputs = [ pkg-config @@ -28,7 +28,7 @@ rustPlatform.buildRustPackage rec { buildInputs = [ wayland libdrm - ffmpeg + ffmpeg_7 ]; doCheck = false; # tests use host compositor, etc diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index fac69e456adc0..553bb6794a9d3 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -4654,9 +4654,7 @@ with pkgs; wl-mirror = callPackage ../tools/wayland/wl-mirror { }; - wl-screenrec = callPackage ../tools/wayland/wl-screenrec { - ffmpeg = ffmpeg_6; - }; + wl-screenrec = callPackage ../tools/wayland/wl-screenrec { }; wleave = callPackage ../tools/wayland/wleave { };