Merge pull request #10150 from khumba/netbeans-8

netbeans: 7.4 -> 8.0.2

+28 -10
+17 -10
pkgs/applications/editors/netbeans/default.nix
··· 1 - {stdenv, fetchurl, jdk, unzip, which, makeWrapper, makeDesktopItem}: 2 3 let 4 desktopItem = makeDesktopItem { ··· 11 }; 12 in 13 stdenv.mkDerivation { 14 - name = "netbeans-7.4"; 15 src = fetchurl { 16 - url = http://download.netbeans.org/netbeans/7.4/final/zip/netbeans-7.4-201310111528.zip; 17 - sha256 = "0nrnghnsdix5cmp86xi1gmvarhjk2k8mlbld3dfa9impm8gpv6mx"; 18 }; 19 buildCommand = '' 20 - # Unpack and copy the stuff 21 unzip $src 22 - mkdir -p $out 23 cp -a netbeans $out 24 - 25 - # Create a wrapper capable of starting it 26 - mkdir -p $out/bin 27 makeWrapper $out/netbeans/bin/netbeans $out/bin/netbeans \ 28 --prefix PATH : ${jdk}/bin:${which}/bin \ 29 --prefix JAVA_HOME : ${jdk.home} \ ··· 34 cp ${desktopItem}/share/applications/* $out/share/applications 35 ''; 36 37 - buildInputs = [ unzip makeWrapper ]; 38 39 meta = { 40 description = "An integrated development environment for Java, C, C++ and PHP";
··· 1 + { stdenv, fetchurl, makeWrapper, makeDesktopItem 2 + , gawk, jdk, perl, python, unzip, which 3 + }: 4 5 let 6 desktopItem = makeDesktopItem { ··· 13 }; 14 in 15 stdenv.mkDerivation { 16 + name = "netbeans-8.0.2"; 17 src = fetchurl { 18 + url = http://download.netbeans.org/netbeans/8.0.2/final/zip/netbeans-8.0.2-201411181905.zip; 19 + sha256 = "1h9cqpwsnrhcnn4fqz3rr4s5jln8cfwki8af9zikq9j6aza337xv"; 20 }; 21 + 22 buildCommand = '' 23 + # Unpack and perform some path patching. 24 unzip $src 25 + patch -p1 <${./path.patch} 26 + substituteInPlace netbeans/platform/lib/nbexec \ 27 + --subst-var-by AWK ${gawk}/bin/awk 28 + patchShebangs . 29 + 30 + # Copy to installation directory and create a wrapper capable of starting 31 + # it. 32 + mkdir -p $out/bin 33 cp -a netbeans $out 34 makeWrapper $out/netbeans/bin/netbeans $out/bin/netbeans \ 35 --prefix PATH : ${jdk}/bin:${which}/bin \ 36 --prefix JAVA_HOME : ${jdk.home} \ ··· 41 cp ${desktopItem}/share/applications/* $out/share/applications 42 ''; 43 44 + buildInputs = [ makeWrapper perl python unzip ]; 45 46 meta = { 47 description = "An integrated development environment for Java, C, C++ and PHP";
+11
pkgs/applications/editors/netbeans/path.patch
···
··· 1 + --- a/netbeans/platform/lib/nbexec 2015-09-29 21:26:39.282600903 -0700 2 + +++ b/netbeans/platform/lib/nbexec 2015-09-29 21:26:58.977697858 -0700 3 + @@ -198,7 +198,7 @@ 4 + SunOS*) awk=nawk ;; 5 + *) awk=awk ;; 6 + esac 7 + - jdk_version=$("${jdkhome}/bin/java" -version 2>&1 | "/usr/bin/${awk}" -F '"' '/version/ {print substr($2, 1, 3)}') 8 + + jdk_version=$("${jdkhome}/bin/java" -version 2>&1 | "@AWK@" -F '"' '/version/ {print substr($2, 1, 3)}') 9 + if [ "$jdk_version" = "1.7" ] ; then 10 + jargs="$jargs $launcher_args" 11 + fi