mirror of
https://github.com/NixOS/nixpkgs.git
synced 2024-12-29 09:04:17 +00:00
397d06d212
The patch was trying to add LD_LIBRARY_PATH to the beginning of the wrapper, but it was failing to do that. There are still background errors when starting the binary.
28 lines
1.3 KiB
Diff
28 lines
1.3 KiB
Diff
--- /home/dario/Downloads/jitsi/resources/install/generic/run.sh 2013-11-01 15:37:21.000000000 +0000
|
|
+++ jitsi/resources/install/generic/run.sh 2014-03-04 11:52:30.796397567 +0000
|
|
@@ -1,4 +1,9 @@
|
|
-mkdir -p $HOME/.sip-communicator/log
|
|
+#! /bin/bash
|
|
+# A modified version of the generic run.sh
|
|
+
|
|
+#mkdir -p $HOME/.sip-communicator/log
|
|
+
|
|
+cd "$(dirname "$(dirname "$(readlink -f "${BASH_SOURCE[0]}")")")"
|
|
|
|
# Get architecture
|
|
ARCH=`uname -m | sed -e s/x86_64/64/ -e s/i.86/32/`
|
|
@@ -6,10 +11,12 @@
|
|
# Additionnal JVM arguments
|
|
CLIENTARGS=""
|
|
|
|
+NATIVELIBS="lib/native/linux-64"
|
|
if [ $ARCH = 32 ]
|
|
then
|
|
CLIENTARGS="-client -Xmx256m"
|
|
+ NATIVELIBS="lib/native/linux"
|
|
fi
|
|
|
|
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
|
|
+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
|