diff options
| author | Alyssa Ross <hi@alyssa.is> | 2019-02-07 15:19:21 +0000 |
|---|---|---|
| committer | Alyssa Ross <hi@alyssa.is> | 2019-02-07 23:35:47 +0000 |
| commit | e5013c05a2f845255debf94318ab38ecef1c186b (patch) | |
| tree | bec11a0bd31d3432a16899e5539f1098f1c168a4 /nixpkgs/pkgs/applications/video/obs-studio | |
| parent | 4fc07c92ec07cafcf6d56143ea7334693143ef88 (diff) | |
| parent | 2d2f10475138b7206572dc3ec288184df2be022e (diff) | |
| download | nixlib-e5013c05a2f845255debf94318ab38ecef1c186b.tar nixlib-e5013c05a2f845255debf94318ab38ecef1c186b.tar.gz nixlib-e5013c05a2f845255debf94318ab38ecef1c186b.tar.bz2 nixlib-e5013c05a2f845255debf94318ab38ecef1c186b.tar.lz nixlib-e5013c05a2f845255debf94318ab38ecef1c186b.tar.xz nixlib-e5013c05a2f845255debf94318ab38ecef1c186b.tar.zst nixlib-e5013c05a2f845255debf94318ab38ecef1c186b.zip | |
Merge commit '2d2f10475138b7206572dc3ec288184df2be022e'
Diffstat (limited to 'nixpkgs/pkgs/applications/video/obs-studio')
| -rw-r--r-- | nixpkgs/pkgs/applications/video/obs-studio/default.nix | 16 |
1 files changed, 15 insertions, 1 deletions
diff --git a/nixpkgs/pkgs/applications/video/obs-studio/default.nix b/nixpkgs/pkgs/applications/video/obs-studio/default.nix index 3bb8f31b9872..579d5566f134 100644 --- a/nixpkgs/pkgs/applications/video/obs-studio/default.nix +++ b/nixpkgs/pkgs/applications/video/obs-studio/default.nix @@ -1,5 +1,6 @@ { stdenv , fetchFromGitHub +, fetchpatch , cmake , fdk_aac , ffmpeg @@ -20,6 +21,11 @@ , vlc , mbedtls +, scriptingSupport ? true +, luajit +, swig +, python3 + , alsaSupport ? false , alsaLib , pulseaudioSupport ? false @@ -39,6 +45,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 ]; @@ -60,6 +73,7 @@ in stdenv.mkDerivation rec { makeWrapper mbedtls ] + ++ optional scriptingSupport [ luajit swig python3 ] ++ optional alsaSupport alsaLib ++ optional pulseaudioSupport libpulseaudio; @@ -83,6 +97,6 @@ in stdenv.mkDerivation rec { homepage = https://obsproject.com; maintainers = with maintainers; [ jb55 MP2E ]; license = licenses.gpl2; - platforms = with platforms; linux; + platforms = [ "x86_64-linux" "i686-linux" ]; }; } |