mirror of https://github.com/materusPL/Nixerus.git
obs-studio: link libcef instead copy
This commit is contained in:
parent
893384eb87
commit
c49ae08896
|
@ -120,13 +120,13 @@ stdenv.mkDerivation rec {
|
||||||
postUnpack = ''
|
postUnpack = ''
|
||||||
mkdir -p cef/Release cef/Resources cef/libcef_dll_wrapper/
|
mkdir -p cef/Release cef/Resources cef/libcef_dll_wrapper/
|
||||||
for i in ${libcef}/share/cef/*; do
|
for i in ${libcef}/share/cef/*; do
|
||||||
cp -r $i cef/Release/
|
ln -s $i cef/Release/
|
||||||
cp -r $i cef/Resources/
|
ln -s $i cef/Resources/
|
||||||
done
|
done
|
||||||
cp -r ${swiftshader}/lib/libvk_swiftshader.so cef/Release/
|
ln -s ${swiftshader}/lib/libvk_swiftshader.so cef/Release/
|
||||||
cp -r ${libcef}/lib/libcef.so cef/Release/
|
ln -s ${libcef}/lib/libcef.so cef/Release/
|
||||||
cp -r ${libcef}/lib/libcef_dll_wrapper.a cef/libcef_dll_wrapper/
|
ln -s ${libcef}/lib/libcef_dll_wrapper.a cef/libcef_dll_wrapper/
|
||||||
cp -r ${libcef}/include cef/
|
ln -s ${libcef}/include cef/
|
||||||
'';
|
'';
|
||||||
|
|
||||||
# obs attempts to dlopen libobs-opengl, it fails unless we make sure
|
# obs attempts to dlopen libobs-opengl, it fails unless we make sure
|
||||||
|
@ -143,7 +143,11 @@ stdenv.mkDerivation rec {
|
||||||
];
|
];
|
||||||
|
|
||||||
dontWrapGApps = true;
|
dontWrapGApps = true;
|
||||||
|
|
||||||
preFixup = ''
|
preFixup = ''
|
||||||
|
rm $out/lib/obs-plugins/libcef.so
|
||||||
|
rm $out/lib/obs-plugins/libvk_swiftshader.so
|
||||||
|
|
||||||
qtWrapperArgs+=(
|
qtWrapperArgs+=(
|
||||||
--prefix LD_LIBRARY_PATH : "${lib.makeLibraryPath [ xorg.libX11 libvlc ]}"
|
--prefix LD_LIBRARY_PATH : "${lib.makeLibraryPath [ xorg.libX11 libvlc ]}"
|
||||||
--suffix LD_LIBRARY_PATH : "${lib.makeLibraryPath [ libGL vulkan-loader ]}"
|
--suffix LD_LIBRARY_PATH : "${lib.makeLibraryPath [ libGL vulkan-loader ]}"
|
||||||
|
@ -155,6 +159,9 @@ stdenv.mkDerivation rec {
|
||||||
postFixup = lib.optionalString stdenv.isLinux ''
|
postFixup = lib.optionalString stdenv.isLinux ''
|
||||||
addOpenGLRunpath $out/lib/lib*.so
|
addOpenGLRunpath $out/lib/lib*.so
|
||||||
addOpenGLRunpath $out/lib/obs-plugins/*.so
|
addOpenGLRunpath $out/lib/obs-plugins/*.so
|
||||||
|
|
||||||
|
ln -s ${swiftshader}/lib/libvk_swiftshader.so $out/lib/obs-plugins/libvk_swiftshader.so
|
||||||
|
ln -s ${libcef}/lib/libcef.so $out/lib/obs-plugins/libcef.so
|
||||||
'';
|
'';
|
||||||
|
|
||||||
meta = with lib; {
|
meta = with lib; {
|
||||||
|
|
Loading…
Reference in New Issue