summary refs log tree commit diff
path: root/pkgs/top-level
diff options
context:
space:
mode:
authorPeter Simons <simons@cryp.to>2020-01-22 12:50:24 +0100
committerPeter Simons <simons@cryp.to>2020-01-22 12:55:58 +0100
commita3f6eb3bf7859a0be647ae91127ea35360aacdee (patch)
tree4b8a386de4428eb743096c1d4543cba4027e411d /pkgs/top-level
parent051c3e3eb18b0cd6f9ac3ee49ad1a93f34412817 (diff)
downloadnixpkgs-a3f6eb3bf7859a0be647ae91127ea35360aacdee.tar
nixpkgs-a3f6eb3bf7859a0be647ae91127ea35360aacdee.tar.gz
nixpkgs-a3f6eb3bf7859a0be647ae91127ea35360aacdee.tar.bz2
nixpkgs-a3f6eb3bf7859a0be647ae91127ea35360aacdee.tar.lz
nixpkgs-a3f6eb3bf7859a0be647ae91127ea35360aacdee.tar.xz
nixpkgs-a3f6eb3bf7859a0be647ae91127ea35360aacdee.tar.zst
nixpkgs-a3f6eb3bf7859a0be647ae91127ea35360aacdee.zip
obs-studio: prefer ffmpeg 4.x over 3.x
Diffstat (limited to 'pkgs/top-level')
-rw-r--r--pkgs/top-level/all-packages.nix2
1 files changed, 1 insertions, 1 deletions
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 63a930a7686..33390a61581 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -20668,7 +20668,7 @@ in
 
   obs-linuxbrowser = callPackage ../applications/video/obs-studio/linuxbrowser.nix { };
 
-  obs-studio = libsForQt5.callPackage ../applications/video/obs-studio { };
+  obs-studio = libsForQt5.callPackage ../applications/video/obs-studio { ffmpeg = ffmpeg_4; };
 
   obs-wlrobs = callPackage ../applications/video/obs-studio/wlrobs.nix { };