diff options
author | Frederik Rietdijk <fridh@fridh.nl> | 2019-01-05 10:15:00 +0100 |
---|---|---|
committer | Frederik Rietdijk <fridh@fridh.nl> | 2019-01-05 10:15:00 +0100 |
commit | 60a3973a55f0574bf3f11303cb1dbc20a8bb6d70 (patch) | |
tree | 2040f2d41050694da9b2431eb1b7adc8719a425c /pkgs/applications/video | |
parent | aca57f1aed4068ee374d51b211844972dcb0192f (diff) | |
parent | d9707792b5e1af8999ddcb790b8b1b06305dd186 (diff) |
Merge staging-next into staging
Diffstat (limited to 'pkgs/applications/video')
-rw-r--r-- | pkgs/applications/video/obs-studio/default.nix | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/pkgs/applications/video/obs-studio/default.nix b/pkgs/applications/video/obs-studio/default.nix index 3bb8f31b98722..9fc9c5871086b 100644 --- a/pkgs/applications/video/obs-studio/default.nix +++ b/pkgs/applications/video/obs-studio/default.nix @@ -1,5 +1,6 @@ { stdenv , fetchFromGitHub +, fetchpatch , cmake , fdk_aac , ffmpeg @@ -39,6 +40,13 @@ in stdenv.mkDerivation rec { sha256 = "0ri9qkqk3h71b1a5bwpjzqdr21bbmfqbykg48l779d20zln23n1i"; }; + patches = [ + (fetchpatch { + url = "https://patch-diff.githubusercontent.com/raw/obsproject/obs-studio/pull/1557.diff"; + sha256 = "162fnkxh2wyn6wrrm1kzv7c2mn96kx35vlmk2qwn1nqlifbpsfyq"; + }) + ]; + nativeBuildInputs = [ cmake pkgconfig ]; |