dev/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions 2 Packages Projects Releases Wiki Activity

Merge pull request #88516 from peterhoeg/f/obs

Browse Source 
obs-studio: show the actual version instead of 0.0.1
This commit is contained in:
Peter Hoeg 2020-05-22 08:54:38 +08:00 committed by GitHub
commit b462b8b9e5
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 28 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

50
pkgs/applications/video/obs-studio/default.nix
View File

@ -36,6 +36,7 @@
let let
inherit (stdenv.lib) optional optionals; inherit (stdenv.lib) optional optionals;
in mkDerivation rec { in mkDerivation rec {
pname = "obs-studio"; pname = "obs-studio";
version = "25.0.8"; version = "25.0.8";
@ -49,32 +50,37 @@ in mkDerivation rec {
nativeBuildInputs = [ addOpenGLRunpath cmake pkgconfig ]; nativeBuildInputs = [ addOpenGLRunpath cmake pkgconfig ];
buildInputs = [ curl buildInputs = [
fdk_aac curl
ffmpeg fdk_aac
jansson ffmpeg
libjack2 jansson
libv4l libjack2
libxkbcommon libv4l
libpthreadstubs libxkbcommon
libXdmcp libpthreadstubs
qtbase libXdmcp
qtx11extras qtbase
qtsvg qtx11extras
speex qtsvg
x264 speex
vlc x264
makeWrapper vlc
mbedtls makeWrapper
] mbedtls
++ optionals scriptingSupport [ luajit swig python3 ] ]
++ optional alsaSupport alsaLib ++ optionals scriptingSupport [ luajit swig python3 ]
++ optional pulseaudioSupport libpulseaudio; ++ optional alsaSupport alsaLib
++ optional pulseaudioSupport libpulseaudio;
# obs attempts to dlopen libobs-opengl, it fails unless we make sure # obs attempts to dlopen libobs-opengl, it fails unless we make sure
# DL_OPENGL is an explicit path. Not sure if there's a better way # DL_OPENGL is an explicit path. Not sure if there's a better way
# to handle this. # to handle this.
cmakeFlags = [ "-DCMAKE_CXX_FLAGS=-DDL_OPENGL=\\\"$(out)/lib/libobs-opengl.so\\\"" ]; cmakeFlags = [
"-DCMAKE_CXX_FLAGS=-DDL_OPENGL=\\\"$(out)/lib/libobs-opengl.so\\\""
"-DOBS_VERSION_OVERRIDE=${version}"
"-Wno-dev" # kill dev warnings that are useless for packaging
];
postInstall = '' postInstall = ''
wrapProgram $out/bin/obs \ wrapProgram $out/bin/obs \