diff options
author | K900 <me@0upti.me> | 2024-01-12 13:59:54 +0300 |
---|---|---|
committer | K900 <me@0upti.me> | 2024-01-12 13:59:54 +0300 |
commit | e7b611e59d74da47047dee062aec1c50ac0823ca (patch) | |
tree | 762982cd2f5ba7f7a02bab598d9db7ac837e04b3 /pkgs/applications/video/obs-studio | |
parent | 9490738be7b6a33844e4faf192f168bb755539e6 (diff) | |
parent | 96478c43ec80609cd6da1385560eb0bf0a4e27ea (diff) |
Merge remote-tracking branch 'origin/master' into staging-next
Diffstat (limited to 'pkgs/applications/video/obs-studio')
-rw-r--r-- | pkgs/applications/video/obs-studio/default.nix | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/pkgs/applications/video/obs-studio/default.nix b/pkgs/applications/video/obs-studio/default.nix index 55d18bf604a7b..e530a0e0c5427 100644 --- a/pkgs/applications/video/obs-studio/default.nix +++ b/pkgs/applications/video/obs-studio/default.nix @@ -36,6 +36,7 @@ , libcef , pciutils , pipewireSupport ? stdenv.isLinux +, withFdk ? true , pipewire , libdrm , libajantv2 @@ -106,7 +107,6 @@ stdenv.mkDerivation (finalAttrs: { buildInputs = [ curl - fdk_aac ffmpeg jansson libcef @@ -138,7 +138,8 @@ stdenv.mkDerivation (finalAttrs: { ++ optionals scriptingSupport [ luajit python3 ] ++ optional alsaSupport alsa-lib ++ optional pulseaudioSupport libpulseaudio - ++ optionals pipewireSupport [ pipewire libdrm ]; + ++ optionals pipewireSupport [ pipewire libdrm ] + ++ optional withFdk fdk_aac; # Copied from the obs-linuxbrowser postUnpack = '' @@ -160,6 +161,7 @@ stdenv.mkDerivation (finalAttrs: { "-DCEF_ROOT_DIR=../../cef" "-DENABLE_JACK=ON" (lib.cmakeBool "ENABLE_QSV11" stdenv.hostPlatform.isx86_64) + (lib.cmakeBool "ENABLE_LIBFDK" withFdk) ]; dontWrapGApps = true; @@ -198,7 +200,7 @@ stdenv.mkDerivation (finalAttrs: { ''; homepage = "https://obsproject.com"; maintainers = with maintainers; [ jb55 MP2E materus fpletz ]; - license = licenses.gpl2Plus; + license = with licenses; [ gpl2Plus ] ++ optional withFdk fraunhofer-fdk; platforms = [ "x86_64-linux" "i686-linux" "aarch64-linux" ]; mainProgram = "obs"; }; |