From 7f17f677f5eea3eb219f42a5f02b5e304dc94240 Mon Sep 17 00:00:00 2001 From: wrvsrx Date: Sun, 14 Sep 2025 02:53:55 +0800 Subject: [PATCH] wemeet: improve packaging This commit make following changes: 1. fix wrong bwrap paths 2. add a comment about why we need to remove bundled libcurl --- pkgs/by-name/we/wemeet/package.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/by-name/we/wemeet/package.nix b/pkgs/by-name/we/wemeet/package.nix index 53f9dcc3522b..6fbf70d6335d 100644 --- a/pkgs/by-name/we/wemeet/package.nix +++ b/pkgs/by-name/we/wemeet/package.nix @@ -189,6 +189,7 @@ stdenv.mkDerivation { mkdir -p $out/app cp -r opt/wemeet $out/app/wemeet cp -r usr/share $out/share + # bundled libcurl depends on openssl 1.1 which is not available in nixpkgs rm -f $out/app/wemeet/lib/libcurl.so substituteInPlace $out/share/applications/wemeetapp.desktop \ --replace-fail "/opt/wemeet/wemeetapp.sh" "wemeet" \ @@ -200,8 +201,7 @@ stdenv.mkDerivation { ln -s $out/app/wemeet/bin/raw/xcast.conf $out/app/wemeet/bin/xcast.conf ln -s $out/app/wemeet/plugins $out/app/wemeet/lib/plugins ln -s $out/app/wemeet/resources $out/app/wemeet/lib/resources - mkdir -p $out/app/wemeet/lib/translations - ln -s $out/app/wemeet/translations/qtwebengine_locales $out/app/wemeet/lib/translations/qtwebengine_locales + ln -s $out/app/wemeet/translations $out/app/wemeet/lib/translations runHook postInstall ''; @@ -217,9 +217,9 @@ stdenv.mkDerivation { "--set QT_STYLE_OVERRIDE fusion" "--set IBUS_USE_PORTAL 1" "--set XKB_CONFIG_ROOT ${xkeyboard_config}/share/X11/xkb" - "--prefix LD_LIBRARY_PATH : $out/lib:$out/translations:${xorg.libXext}/lib:${xorg.libXdamage}/lib:${opencv4WithoutCuda}/lib:${xorg.libXrandr}/lib" - "--prefix PATH : $out/bin" - "--prefix QT_PLUGIN_PATH : $out/plugins" + "--prefix LD_LIBRARY_PATH : $out/app/wemeet/lib:$out/translations:${xorg.libXext}/lib:${xorg.libXdamage}/lib:${opencv4WithoutCuda}/lib:${xorg.libXrandr}/lib" + "--prefix PATH : $out/app/wemeet/bin" + "--prefix QT_PLUGIN_PATH : $out/app/wemeet/plugins" ]; commonWrapperArgs = baseWrapperArgs ++ [ "--prefix LD_PRELOAD : ${libwemeetwrap}/lib/libwemeetwrap.so"