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

jitsi: Fixed java not found

Browse Source 
Cosmetic change

Closes #24565
This commit is contained in:
ndowens 2017-04-02 10:28:00 -05:00 committed by obadz
parent 144d1e7be4
commit b1c0814999
1 changed files with 7 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -6,7 +6,6 @@
assert stdenv.isLinux; assert stdenv.isLinux;
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "jitsi-${version}"; name = "jitsi-${version}";
version = "2.10.5550"; version = "2.10.5550";
@ -15,7 +14,6 @@ stdenv.mkDerivation rec {
sha256 = "11vjchc3dnzj55x7c62wsm6masvwmij1ifkds917r1qvil1nzz6d"; sha256 = "11vjchc3dnzj55x7c62wsm6masvwmij1ifkds917r1qvil1nzz6d";
}; };
patches = [ ./jitsi.patch ]; patches = [ ./jitsi.patch ];
jitsiItem = makeDesktopItem { jitsiItem = makeDesktopItem {
@ -42,7 +40,8 @@ stdenv.mkDerivation rec {
xorg.libXv xorg.libXv
]); ]);
buildInputs = [unzip ant jdk]; nativeBuildInputs = [ unzip ];
buildInputs = [ ant jdk ];
buildPhase = ''ant make''; buildPhase = ''ant make'';
@ -55,11 +54,11 @@ stdenv.mkDerivation rec {
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
substituteInPlace $out/bin/jitsi \ substituteInPlace $out/bin/jitsi \
--subst-var-by JAVA ${jdk}/bin/java \ --subst-var-by JAVA ${jdk}/bin/java \
--subst-var-by EXTRALIBS ${gtk2.out}/lib --subst-var-by EXTRALIBS ${gtk2.out}/lib
sed -e 's,^java\ ,${jdk}/bin/java ,' -i $out/bin/jitsi
patchShebangs $out patchShebangs $out
libPath="$libPath:${jdk.home}/lib/${jdk.architecture}"
libPath="$libPath:${jdk.jre.home}/lib/${jdk.architecture}"
find $out/ -type f -name '*.so' | while read file; do find $out/ -type f -name '*.so' | while read file; do
patchelf --set-rpath "$libPath" "$file" && \ patchelf --set-rpath "$libPath" "$file" && \
patchelf --shrink-rpath "$file" patchelf --shrink-rpath "$file"
@ -71,7 +70,6 @@ stdenv.mkDerivation rec {
description = "Open Source Video Calls and Chat"; description = "Open Source Video Calls and Chat";
license = licenses.lgpl21Plus; license = licenses.lgpl21Plus;
platforms = platforms.linux; platforms = platforms.linux;
maintainers = [ maintainers.khumba ]; maintainers = with maintainers; [ khumba ndowens ];
}; };
} }