diff options
| author | Bryan Gardiner <bog@khumba.net> | 2015-09-10 09:48:25 -0700 |
|---|---|---|
| committer | Bryan Gardiner <bog@khumba.net> | 2015-09-16 06:42:26 -0700 |
| commit | e422c2398cd946b3e80ee415f76f4d5c930396b4 (patch) | |
| tree | 1b474745b02ba1686bf57ed15e694815c0245270 /pkgs/applications/networking/instant-messengers/jitsi | |
| parent | 8ef6197be5da964f35dec5a4a580fb9685ee9e2e (diff) | |
jitsi: make a path patch for java slightly safer
Diffstat (limited to 'pkgs/applications/networking/instant-messengers/jitsi')
| -rw-r--r-- | pkgs/applications/networking/instant-messengers/jitsi/default.nix | 2 | ||||
| -rw-r--r-- | pkgs/applications/networking/instant-messengers/jitsi/jitsi.patch | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/pkgs/applications/networking/instant-messengers/jitsi/default.nix b/pkgs/applications/networking/instant-messengers/jitsi/default.nix index decd7b6f3926d..f8a637ca4fe75 100644 --- a/pkgs/applications/networking/instant-messengers/jitsi/default.nix +++ b/pkgs/applications/networking/instant-messengers/jitsi/default.nix @@ -51,7 +51,7 @@ stdenv.mkDerivation rec { mkdir $out/bin cp resources/install/generic/run.sh $out/bin/jitsi chmod +x $out/bin/jitsi - sed -i 's| java | ${jdk}/bin/java |' $out/bin/jitsi + substituteInPlace $out/bin/jitsi --replace '@JAVA@' '${jdk}/bin/java' 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 9163cecd175b2..942b3cd0cbe6f 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 ++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 |