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

netbeans: 8.1 -> 8.2

Browse Source
This commit is contained in:
Tim Steinbach 2016-10-14 21:56:26 -04:00
parent d2238cc9f0
commit 405f241e6e
No known key found for this signature in database
GPG Key ID: 83FF2ACAEB6C2D24
2 changed files with 7 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
pkgs/applications/editors/netbeans/default.nix
View File

@ -1,5 +1,5 @@
{ stdenv, fetchurl, makeWrapper, makeDesktopItem { stdenv, fetchurl, makeWrapper, makeDesktopItem
, gawk, jdk, perl, python, unzip, which , jdk, perl, python, unzip, which
}: }:
let let
@ -13,18 +13,15 @@ let
}; };
in in
stdenv.mkDerivation { stdenv.mkDerivation {
name = "netbeans-8.1"; name = "netbeans-8.2";
src = fetchurl { src = fetchurl {
url = http://download.netbeans.org/netbeans/8.1/final/zip/netbeans-8.1-201510222201.zip; url = http://download.netbeans.org/netbeans/8.2/final/zip/netbeans-8.2-201609300101.zip;
sha256 = "1aaf132mndpgfbd5v8izqzp37hjs5gwqwd6zrb519fx0viz9aq5r"; sha256 = "0j092qw7aqfc9vpnvr3ix1ii94p4ik6frcnw708iyv4s9crqi65d";
}; };
buildCommand = '' buildCommand = ''
# Unpack and perform some path patching. # Unpack and perform some path patching.
unzip $src unzip $src
patch -p1 <${./path.patch}
substituteInPlace netbeans/platform/lib/nbexec \
--subst-var-by AWK ${gawk}/bin/awk
patchShebangs . patchShebangs .
# Copy to installation directory and create a wrapper capable of starting # Copy to installation directory and create a wrapper capable of starting

11
pkgs/applications/editors/netbeans/path.patch
View File

@ -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