public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

jitsi: make a path patch for java slightly safer

Browse Source
This commit is contained in:
Bryan Gardiner 2015-09-10 09:48:25 -07:00
parent 8ef6197be5
commit e422c2398c
No known key found for this signature in database
GPG Key ID: 53EFBCA063E6183C
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pkgs/applications/networking/instant-messengers/jitsi/default.nix
View File

@ -51,7 +51,7 @@ stdenv.mkDerivation rec {
mkdir $out/bin mkdir $out/bin
cp resources/install/generic/run.sh $out/bin/jitsi cp resources/install/generic/run.sh $out/bin/jitsi
chmod +x $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 patchShebangs $out
libPath="$libPath:${jdk.jre.home}/lib/${jdk.architecture}" libPath="$libPath:${jdk.jre.home}/lib/${jdk.architecture}"

2
pkgs/applications/networking/instant-messengers/jitsi/jitsi.patch
View File

@ -24,4 +24,4 @@
export PATH=$PATH:native 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 -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