Unverified Commit 87b5477a authored by Nick Cao's avatar Nick Cao Committed by GitHub
Browse files

Merge pull request #285912 from eclairevoyant/jami

jami: fix wrapper for non-gnome environments
parents f2709621 37578b19
Loading
Loading
Loading
Loading
+8 −0
Original line number Diff line number Diff line
@@ -50,6 +50,7 @@
, qtsvg
, qtwebengine
, qtwebchannel
, wrapGAppsHook
, withWebengine ? true

  # for pjsip
@@ -200,7 +201,10 @@ stdenv.mkDerivation rec {
    ln -s ${daemon} $out/daemon
  '';

  dontWrapGApps = true;

  nativeBuildInputs = [
    wrapGAppsHook
    wrapQtAppsHook
    pkg-config
    cmake
@@ -234,6 +238,10 @@ stdenv.mkDerivation rec {
    "--set-default QT_QPA_PLATFORM xcb"
  ];

  preFixup = ''
    qtWrapperArgs+=("''${gappsWrapperArgs[@]}")
  '';

  passthru.updateScript = gitUpdater {
    rev-prefix = "stable/";
  };