From acb6aeddf6bb7a29a0c28f501432052715df160c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Thu, 11 Jan 2024 09:18:14 +0100 Subject: [PATCH] obs-studio: drop an already applied patch This is basically a merge conflict of update and patching (d00c65029c and a819be8645). --- pkgs/applications/video/obs-studio/default.nix | 4 ---- 1 file changed, 4 deletions(-) diff --git a/pkgs/applications/video/obs-studio/default.nix b/pkgs/applications/video/obs-studio/default.nix index e69adb863d94..55d18bf604a7 100644 --- a/pkgs/applications/video/obs-studio/default.nix +++ b/pkgs/applications/video/obs-studio/default.nix @@ -93,10 +93,6 @@ stdenv.mkDerivation (finalAttrs: { url = "https://github.com/obsproject/obs-studio/commit/6e080a68067b27fe5463f0f4eee7df690451f3d7.patch"; hash = "sha256-nbn/q3uszoHaDvaW8Et1MS1sgQzMsJRmjGSMHzUxV70="; }) - (fetchpatch { - url = "https://github.com/obsproject/obs-studio/commit/df70743385965f979f922e05af9a249f20f94869.patch"; - hash = "sha256-uIBsFuggz8SgQsQ0Ry2lvSPeMm63lgVe7oFx/3aT12k="; - }) ]; nativeBuildInputs = [