diff options
author | ndowens <ndowens04@gmail.com> | 2017-04-02 10:28:00 -0500 |
---|---|---|
committer | obadz <obadz-git@obadz.com> | 2017-04-02 16:51:08 +0100 |
commit | b1c081499929f8ff5d879554a0283c421db0d063 (patch) | |
tree | f771e1d64ce543dcb417dfb680a70eff2a00585f /pkgs/applications | |
parent | 144d1e7be467fe87b6c3343ce57de8a5facf8b63 (diff) |
jitsi: Fixed java not found
Cosmetic change Closes #24565
Diffstat (limited to 'pkgs/applications')
-rw-r--r-- | pkgs/applications/networking/instant-messengers/jitsi/default.nix | 16 |
1 files changed, 7 insertions, 9 deletions
diff --git a/pkgs/applications/networking/instant-messengers/jitsi/default.nix b/pkgs/applications/networking/instant-messengers/jitsi/default.nix index 30fedec1a4bbe..c4cb25dfe9875 100644 --- 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 ]; }; - } |