diff options
| author | Graham Christensen <graham@grahamc.com> | 2016-10-15 07:11:20 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-10-15 07:11:20 -0400 |
| commit | 1de561e67067c334ffb4d3ceeb1d80395dacc89a (patch) | |
| tree | 3d1ed313c19f34bd09543b04c2a1e8da9465a3f1 | |
| parent | 9b99c9a296a236e545e1983846cffa47ca41649c (diff) | |
| parent | 405f241e6e9a2a8a3e0d4059f41b7b9c9a3d392a (diff) | |
| download | nixlib-1de561e67067c334ffb4d3ceeb1d80395dacc89a.tar nixlib-1de561e67067c334ffb4d3ceeb1d80395dacc89a.tar.gz nixlib-1de561e67067c334ffb4d3ceeb1d80395dacc89a.tar.bz2 nixlib-1de561e67067c334ffb4d3ceeb1d80395dacc89a.tar.lz nixlib-1de561e67067c334ffb4d3ceeb1d80395dacc89a.tar.xz nixlib-1de561e67067c334ffb4d3ceeb1d80395dacc89a.tar.zst nixlib-1de561e67067c334ffb4d3ceeb1d80395dacc89a.zip | |
Merge pull request #19564 from NeQuissimus/netbeans_8_2
netbeans: 8.1 -> 8.2
| -rw-r--r-- | pkgs/applications/editors/netbeans/default.nix | 17 | ||||
| -rw-r--r-- | pkgs/applications/editors/netbeans/path.patch | 11 |
2 files changed, 7 insertions, 21 deletions
diff --git a/pkgs/applications/editors/netbeans/default.nix b/pkgs/applications/editors/netbeans/default.nix index 289de0ad91ac..a23c5242a24b 100644 --- a/pkgs/applications/editors/netbeans/default.nix +++ b/pkgs/applications/editors/netbeans/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, makeWrapper, makeDesktopItem -, gawk, jdk, perl, python, unzip, which +, jdk, perl, python, unzip, which }: let @@ -13,18 +13,15 @@ let }; in stdenv.mkDerivation { - name = "netbeans-8.1"; + name = "netbeans-8.2"; src = fetchurl { - url = http://download.netbeans.org/netbeans/8.1/final/zip/netbeans-8.1-201510222201.zip; - sha256 = "1aaf132mndpgfbd5v8izqzp37hjs5gwqwd6zrb519fx0viz9aq5r"; + url = http://download.netbeans.org/netbeans/8.2/final/zip/netbeans-8.2-201609300101.zip; + sha256 = "0j092qw7aqfc9vpnvr3ix1ii94p4ik6frcnw708iyv4s9crqi65d"; }; buildCommand = '' # Unpack and perform some path patching. unzip $src - patch -p1 <${./path.patch} - substituteInPlace netbeans/platform/lib/nbexec \ - --subst-var-by AWK ${gawk}/bin/awk patchShebangs . # Copy to installation directory and create a wrapper capable of starting @@ -35,14 +32,14 @@ stdenv.mkDerivation { --prefix PATH : ${stdenv.lib.makeBinPath [ jdk which ]} \ --prefix JAVA_HOME : ${jdk.home} \ --add-flags "--jdkhome ${jdk.home}" - + # Create desktop item, so we can pick it from the KDE/GNOME menu mkdir -p $out/share/applications cp ${desktopItem}/share/applications/* $out/share/applications ''; - + buildInputs = [ makeWrapper perl python unzip ]; - + meta = { description = "An integrated development environment for Java, C, C++ and PHP"; maintainers = [ stdenv.lib.maintainers.sander ]; diff --git a/pkgs/applications/editors/netbeans/path.patch b/pkgs/applications/editors/netbeans/path.patch deleted file mode 100644 index 57b5730e137c..000000000000 --- a/pkgs/applications/editors/netbeans/path.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- a/netbeans/platform/lib/nbexec 2015-09-29 21:26:39.282600903 -0700 -+++ b/netbeans/platform/lib/nbexec 2015-09-29 21:26:58.977697858 -0700 -@@ -198,7 +198,7 @@ - SunOS*) awk=nawk ;; - *) awk=awk ;; - esac -- jdk_version=$("${jdkhome}/bin/java" -version 2>&1 | "/usr/bin/${awk}" -F '"' '/version/ {print substr($2, 1, 3)}') -+ jdk_version=$("${jdkhome}/bin/java" -version 2>&1 | "@AWK@" -F '"' '/version/ {print substr($2, 1, 3)}') - if [ "$jdk_version" = "1.7" ] ; then - jargs="$jargs $launcher_args" - fi |