Merge pull request #285912 from eclairevoyant/jami
jami: fix wrapper for non-gnome environments
This commit is contained in:
commit
87b5477a39
1 changed files with 8 additions and 0 deletions
|
@ -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/";
|
||||
};
|
||||
|
|
Loading…
Reference in a new issue