Merge pull request #88516 from peterhoeg/f/obs

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

View file

@ -36,6 +36,7 @@
let
inherit (stdenv.lib) optional optionals;
in mkDerivation rec {
pname = "obs-studio";
version = "25.0.8";
@ -49,32 +50,37 @@ in mkDerivation rec {
nativeBuildInputs = [ addOpenGLRunpath cmake pkgconfig ];
buildInputs = [ curl
fdk_aac
ffmpeg
jansson
libjack2
libv4l
libxkbcommon
libpthreadstubs
libXdmcp
qtbase
qtx11extras
qtsvg
speex
x264
vlc
makeWrapper
mbedtls
]
++ optionals scriptingSupport [ luajit swig python3 ]
++ optional alsaSupport alsaLib
++ optional pulseaudioSupport libpulseaudio;
buildInputs = [
curl
fdk_aac
ffmpeg
jansson
libjack2
libv4l
libxkbcommon
libpthreadstubs
libXdmcp
qtbase
qtx11extras
qtsvg
speex
x264
vlc
makeWrapper
mbedtls
]
++ optionals scriptingSupport [ luajit swig python3 ]
++ optional alsaSupport alsaLib
++ optional pulseaudioSupport libpulseaudio;
# 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
# 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 = ''
wrapProgram $out/bin/obs \