git.iko.soy/typeable/nixpkgs
on master help sign in
Merge pull request #88516 from peterhoeg/f/obs

obs-studio: show the actual version instead of 0.0.1

commitb462b8b9e5cb00d0b889559773b611229d260137 authorPeter Hoeg <peter@hoeg.com> dateFri 22 May 2020, 08:54 (7 years ago) parent98ac19923e4067
1 file changed+28−22
pkgs/applications/video/obs-studio/default.nix+28−22
pkgs/applications/video/obs-studio/default.nix+28−22
@@ -36,6 +36,7 @@
3636
3737let
3838 inherit (stdenv.lib) optional optionals;
39+
3940in mkDerivation rec {
4041 pname = "obs-studio";
4142 version = "25.0.8";
@@ -49,32 +50,37 @@ in mkDerivation rec {
4950
5051 nativeBuildInputs = [ addOpenGLRunpath cmake pkgconfig ];
5152
52− buildInputs = [ curl
53− fdk_aac
54− ffmpeg
55− jansson
56− libjack2
57− libv4l
58− libxkbcommon
59− libpthreadstubs
60− libXdmcp
61− qtbase
62− qtx11extras
63− qtsvg
64− speex
65− x264
66− vlc
67− makeWrapper
68− mbedtls
69− ]
70− ++ optionals scriptingSupport [ luajit swig python3 ]
71− ++ optional alsaSupport alsaLib
72− ++ optional pulseaudioSupport libpulseaudio;
53+ buildInputs = [
54+ curl
55+ fdk_aac
56+ ffmpeg
57+ jansson
58+ libjack2
59+ libv4l
60+ libxkbcommon
61+ libpthreadstubs
62+ libXdmcp
63+ qtbase
64+ qtx11extras
65+ qtsvg
66+ speex
67+ x264
68+ vlc
69+ makeWrapper
70+ mbedtls
71+ ]
72+ ++ optionals scriptingSupport [ luajit swig python3 ]
73+ ++ optional alsaSupport alsaLib
74+ ++ optional pulseaudioSupport libpulseaudio;
7375
7476 # obs attempts to dlopen libobs-opengl, it fails unless we make sure
7577 # DL_OPENGL is an explicit path. Not sure if there's a better way
7678 # to handle this.
77− cmakeFlags = [ "-DCMAKE_CXX_FLAGS=-DDL_OPENGL=\\\"$(out)/lib/libobs-opengl.so\\\"" ];
79+ cmakeFlags = [
80+ "-DCMAKE_CXX_FLAGS=-DDL_OPENGL=\\\"$(out)/lib/libobs-opengl.so\\\""
81+ "-DOBS_VERSION_OVERRIDE=${version}"
82+ "-Wno-dev" # kill dev warnings that are useless for packaging
83+ ];
7884
7985 postInstall = ''
8086 wrapProgram $out/bin/obs \