pyrox.dev / nixpkgs
lol
fork atom

Merge pull request #278127 from the-furry-hubofeverything/obs-libfdk

obs-studio: set libfdk build flag and add the license for it

authored by Franz Pletz and committed by GitHub 376f7bc0 ae2e47dc

+5 -3
unified split
+5 -3
pkgs/applications/video/obs-studio/default.nix
··· 35 , libcef 36 , pciutils 37 , pipewireSupport ? stdenv.isLinux 38 , pipewire 39 , libdrm 40 , libajantv2 ··· 86 87 buildInputs = [ 88 curl 89 - fdk_aac 90 ffmpeg_4 91 jansson 92 libcef ··· 118 ++ optionals scriptingSupport [ luajit python3 ] 119 ++ optional alsaSupport alsa-lib 120 ++ optional pulseaudioSupport libpulseaudio 121 - ++ optionals pipewireSupport [ pipewire libdrm ]; 122 123 # Copied from the obs-linuxbrowser 124 postUnpack = '' ··· 140 "-DCEF_ROOT_DIR=../../cef" 141 "-DENABLE_JACK=ON" 142 (lib.cmakeBool "ENABLE_QSV11" stdenv.hostPlatform.isx86_64) 143 ]; 144 145 dontWrapGApps = true; ··· 178 ''; 179 homepage = "https://obsproject.com"; 180 maintainers = with maintainers; [ jb55 MP2E materus fpletz ]; 181 - license = licenses.gpl2Plus; 182 platforms = [ "x86_64-linux" "i686-linux" "aarch64-linux" ]; 183 mainProgram = "obs"; 184 };
··· 35 , libcef 36 , pciutils 37 , pipewireSupport ? stdenv.isLinux 38 + , withFdk ? true 39 , pipewire 40 , libdrm 41 , libajantv2 ··· 87 88 buildInputs = [ 89 curl 90 ffmpeg_4 91 jansson 92 libcef ··· 118 ++ optionals scriptingSupport [ luajit python3 ] 119 ++ optional alsaSupport alsa-lib 120 ++ optional pulseaudioSupport libpulseaudio 121 + ++ optionals pipewireSupport [ pipewire libdrm ] 122 + ++ optional withFdk fdk_aac; 123 124 # Copied from the obs-linuxbrowser 125 postUnpack = '' ··· 141 "-DCEF_ROOT_DIR=../../cef" 142 "-DENABLE_JACK=ON" 143 (lib.cmakeBool "ENABLE_QSV11" stdenv.hostPlatform.isx86_64) 144 + (lib.cmakeBool "ENABLE_LIBFDK" withFdk) 145 ]; 146 147 dontWrapGApps = true; ··· 180 ''; 181 homepage = "https://obsproject.com"; 182 maintainers = with maintainers; [ jb55 MP2E materus fpletz ]; 183 + license = with licenses; [ gpl2Plus ] ++ optional withFdk fraunhofer-fdk; 184 platforms = [ "x86_64-linux" "i686-linux" "aarch64-linux" ]; 185 mainProgram = "obs"; 186 };