diff options
| author | Bryan Gardiner <bog@khumba.net> | 2015-09-18 00:27:29 -0700 |
|---|---|---|
| committer | Edward Tjörnhammar <ed@cflags.cc> | 2015-09-18 20:11:29 +0200 |
| commit | c8ea6c07c655ba70cf46c52063276bfcfa5b1643 (patch) | |
| tree | 4386f690d02f48f8ccd2335b5f54f54ec18007a6 | |
| parent | 697ef465cd6736c16a0e7f8a2ae88a281323a80b (diff) | |
| download | nixlib-c8ea6c07c655ba70cf46c52063276bfcfa5b1643.tar nixlib-c8ea6c07c655ba70cf46c52063276bfcfa5b1643.tar.gz nixlib-c8ea6c07c655ba70cf46c52063276bfcfa5b1643.tar.bz2 nixlib-c8ea6c07c655ba70cf46c52063276bfcfa5b1643.tar.lz nixlib-c8ea6c07c655ba70cf46c52063276bfcfa5b1643.tar.xz nixlib-c8ea6c07c655ba70cf46c52063276bfcfa5b1643.tar.zst nixlib-c8ea6c07c655ba70cf46c52063276bfcfa5b1643.zip | |
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.
| -rw-r--r-- | pkgs/applications/networking/instant-messengers/jitsi/default.nix | 4 | ||||
| -rw-r--r-- | pkgs/applications/networking/instant-messengers/jitsi/jitsi.patch | 2 |
2 files changed, 4 insertions, 2 deletions
diff --git a/pkgs/applications/networking/instant-messengers/jitsi/default.nix b/pkgs/applications/networking/instant-messengers/jitsi/default.nix index e5e332c25596..494f40f804e1 100644 --- a/pkgs/applications/networking/instant-messengers/jitsi/default.nix +++ b/pkgs/applications/networking/instant-messengers/jitsi/default.nix @@ -54,7 +54,9 @@ stdenv.mkDerivation rec { mkdir $out/bin cp resources/install/generic/run.sh $out/bin/jitsi chmod +x $out/bin/jitsi - substituteInPlace $out/bin/jitsi --replace '@JAVA@' '${jdk}/bin/java' + substituteInPlace $out/bin/jitsi \ + --subst-var-by JAVA ${jdk}/bin/java \ + --subst-var-by EXTRALIBS ${gtk2}/lib patchShebangs $out libPath="$libPath:${jdk.jre.home}/lib/${jdk.architecture}" diff --git a/pkgs/applications/networking/instant-messengers/jitsi/jitsi.patch b/pkgs/applications/networking/instant-messengers/jitsi/jitsi.patch index e672ac6dc2d8..9db7ec368b08 100644 --- a/pkgs/applications/networking/instant-messengers/jitsi/jitsi.patch +++ b/pkgs/applications/networking/instant-messengers/jitsi/jitsi.patch @@ -24,4 +24,4 @@ export PATH=$PATH:native -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 -+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 ++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 |