jitsi: Fixed java not found

Cosmetic change Closes #24565
NixOS · Apr 2, 2017 · b1c0814 · b1c0814
1 parent 144d1e7
commit b1c0814
Showing 1 changed file with 7 additions and 9 deletions.
diff --git a/pkgs/applications/networking/instant-messengers/jitsi/default.nix b/pkgs/applications/networking/instant-messengers/jitsi/default.nix
@@ -6,7 +6,6 @@
 assert stdenv.isLinux;
 
 stdenv.mkDerivation rec {
-
   name = "jitsi-${version}";
   version = "2.10.5550";
 
@@ -15,7 +14,6 @@ stdenv.mkDerivation rec {
     sha256 = "11vjchc3dnzj55x7c62wsm6masvwmij1ifkds917r1qvil1nzz6d";
   };
 
-
   patches = [ ./jitsi.patch ];
 
   jitsiItem = makeDesktopItem {
@@ -42,7 +40,8 @@ stdenv.mkDerivation rec {
     xorg.libXv
   ]);
 
-  buildInputs = [unzip ant jdk];
+  nativeBuildInputs = [ unzip ];
+  buildInputs = [ ant jdk ];
 
   buildPhase = ''ant make'';
 
@@ -55,11 +54,11 @@ stdenv.mkDerivation rec {
     cp resources/install/generic/run.sh $out/bin/jitsi
     chmod +x $out/bin/jitsi
     substituteInPlace $out/bin/jitsi \
-        --subst-var-by JAVA ${jdk}/bin/java \
-        --subst-var-by EXTRALIBS ${gtk2.out}/lib
+      --subst-var-by JAVA ${jdk}/bin/java \
+      --subst-var-by EXTRALIBS ${gtk2.out}/lib
+    sed -e 's,^java\ ,${jdk}/bin/java ,' -i $out/bin/jitsi
     patchShebangs $out
-
-    libPath="$libPath:${jdk.jre.home}/lib/${jdk.architecture}"
+    libPath="$libPath:${jdk.home}/lib/${jdk.architecture}"
     find $out/ -type f -name '*.so' | while read file; do
       patchelf --set-rpath "$libPath" "$file" && \
           patchelf --shrink-rpath "$file"
@@ -71,7 +70,6 @@ stdenv.mkDerivation rec {
     description = "Open Source Video Calls and Chat";
     license = licenses.lgpl21Plus;
     platforms = platforms.linux;
-    maintainers = [ maintainers.khumba ];
+    maintainers = with maintainers; [ khumba ndowens ];
   };
-
 }