obs-studio: avoid double-wrapping the obs binary
Suggested in https://github.com/NixOS/nixpkgs/pull/145664#issuecomment-968107267.
This commit is contained in:
parent
566ef06cf5
commit
90af5cacfb
@ -21,7 +21,6 @@
|
||||
, curl
|
||||
, wayland
|
||||
, xorg
|
||||
, makeWrapper
|
||||
, pkg-config
|
||||
, libvlc
|
||||
, mbedtls
|
||||
@ -67,7 +66,6 @@ mkDerivation rec {
|
||||
addOpenGLRunpath
|
||||
cmake
|
||||
pkg-config
|
||||
makeWrapper
|
||||
wrapGAppsHook
|
||||
]
|
||||
++ optional scriptingSupport swig;
|
||||
@ -121,9 +119,13 @@ mkDerivation rec {
|
||||
"-DCEF_ROOT_DIR=../../cef"
|
||||
];
|
||||
|
||||
qtWrapperArgs = [
|
||||
"--prefix LD_LIBRARY_PATH : ${lib.makeLibraryPath [ xorg.libX11 libvlc ]}"
|
||||
];
|
||||
dontWrapGApps = true;
|
||||
preFixup = ''
|
||||
qtWrapperArgs+=(
|
||||
--prefix LD_LIBRARY_PATH : "${lib.makeLibraryPath [ xorg.libX11 libvlc ]}"
|
||||
''${gappsWrapperArgs[@]}
|
||||
)
|
||||
'';
|
||||
|
||||
postFixup = lib.optionalString stdenv.isLinux ''
|
||||
addOpenGLRunpath $out/lib/lib*.so
|
||||
|
Loading…
Reference in New Issue
Block a user