diff options
| author | Vladimír Čunát <v@cunat.cz> | 2024-01-11 09:18:14 +0100 |
|---|---|---|
| committer | Vladimír Čunát <v@cunat.cz> | 2024-01-11 09:33:28 +0100 |
| commit | acb6aeddf6bb7a29a0c28f501432052715df160c (patch) | |
| tree | ff865a73bee07807dd44de0eec943a0bd04fe1ff /pkgs/applications/video/obs-studio/default.nix | |
| parent | 697b88d91554f480facaf628ee292b64a2d47a15 (diff) | |
obs-studio: drop an already applied patch
This is basically a merge conflict of update and patching (d00c65029c and a819be8645).
Diffstat (limited to 'pkgs/applications/video/obs-studio/default.nix')
| -rw-r--r-- | pkgs/applications/video/obs-studio/default.nix | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/pkgs/applications/video/obs-studio/default.nix b/pkgs/applications/video/obs-studio/default.nix index e69adb863d941..55d18bf604a7b 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 = [ |