lol

jitsi: fix the system tray icon

Java's desktop integration on Linux relies on dlopen'ing some libraries (gtk2 or
gnome). This commit makes Java able to find gtk2, fixing the problem of Jitsi's
system tray icon not appearing.

Part of bug #4014.

authored by

Bryan Gardiner and committed by
Edward Tjörnhammar
c8ea6c07 697ef465

+4 -2
+3 -1
pkgs/applications/networking/instant-messengers/jitsi/default.nix
··· 54 54 mkdir $out/bin 55 55 cp resources/install/generic/run.sh $out/bin/jitsi 56 56 chmod +x $out/bin/jitsi 57 - substituteInPlace $out/bin/jitsi --replace '@JAVA@' '${jdk}/bin/java' 57 + substituteInPlace $out/bin/jitsi \ 58 + --subst-var-by JAVA ${jdk}/bin/java \ 59 + --subst-var-by EXTRALIBS ${gtk2}/lib 58 60 patchShebangs $out 59 61 60 62 libPath="$libPath:${jdk.jre.home}/lib/${jdk.architecture}"
+1 -1
pkgs/applications/networking/instant-messengers/jitsi/jitsi.patch
··· 24 24 25 25 export PATH=$PATH:native 26 26 -java $CLIENTARGS -classpath "lib/felix.jar:sc-bundles/sc-launcher.jar:sc-bundles/util.jar:lib/" -Djava.library.path=native -Dfelix.config.properties=file:./lib/felix.client.run.properties -Djava.util.logging.config.file=lib/logging.properties net.java.sip.communicator.launcher.SIPCommunicator 27 - +exec @JAVA@ $CLIENTARGS -classpath "lib/felix.jar:sc-bundles/sc-launcher.jar:sc-bundles/util.jar:lib/" -Djava.library.path=$NATIVELIBS -Dfelix.config.properties=file:lib/felix.client.run.properties -Djava.util.logging.config.file=lib/logging.properties net.java.sip.communicator.launcher.SIPCommunicator 27 + +LD_LIBRARY_PATH=@EXTRALIBS@ exec @JAVA@ $CLIENTARGS -classpath "lib/felix.jar:sc-bundles/sc-launcher.jar:sc-bundles/util.jar:lib/" -Djava.library.path=$NATIVELIBS -Dfelix.config.properties=file:lib/felix.client.run.properties -Djava.util.logging.config.file=lib/logging.properties net.java.sip.communicator.launcher.SIPCommunicator