summary refs log tree commit diff
path: root/pkgs/development/compilers
diff options
context:
space:
mode:
authorWilliam A. Kennington III <william@wkennington.com>2015-09-18 13:09:20 -0700
committerWilliam A. Kennington III <william@wkennington.com>2015-09-18 14:52:51 -0700
commita1db11198e15b87901bbf22f9686e3630f74b491 (patch)
tree0d17cba381256fc0c721a31f6f639cd6f36ece43 /pkgs/development/compilers
parentf1c67b858d1f9827c9e98ffe81b35164f3ae9617 (diff)
downloadnixlib-a1db11198e15b87901bbf22f9686e3630f74b491.tar
nixlib-a1db11198e15b87901bbf22f9686e3630f74b491.tar.gz
nixlib-a1db11198e15b87901bbf22f9686e3630f74b491.tar.bz2
nixlib-a1db11198e15b87901bbf22f9686e3630f74b491.tar.lz
nixlib-a1db11198e15b87901bbf22f9686e3630f74b491.tar.xz
nixlib-a1db11198e15b87901bbf22f9686e3630f74b491.tar.zst
nixlib-a1db11198e15b87901bbf22f9686e3630f74b491.zip
icedtea_web: 1.6 -> 1.6.1
Diffstat (limited to 'pkgs/development/compilers')
-rw-r--r--pkgs/development/compilers/icedtea-web/default.nix16
1 files changed, 8 insertions, 8 deletions
diff --git a/pkgs/development/compilers/icedtea-web/default.nix b/pkgs/development/compilers/icedtea-web/default.nix
index f1a7b9078156..863c74bc4c1b 100644
--- a/pkgs/development/compilers/icedtea-web/default.nix
+++ b/pkgs/development/compilers/icedtea-web/default.nix
@@ -1,26 +1,26 @@
-{ stdenv, fetchurl, jdk, gtk2, xulrunner, zip, pkgconfig, perl, npapi_sdk, bash }:
+{ stdenv, fetchurl, jdk, gtk2, xulrunner, zip, pkgconfig, perl, npapi_sdk, bash, bc }:
 
 stdenv.mkDerivation rec {
   name = "icedtea-web-${version}";
 
-  version = "1.6";
+  version = "1.6.1";
 
   src = fetchurl {
     url = "http://icedtea.wildebeest.org/download/source/${name}.tar.gz";
-
-    sha256 = "0z8iirvpciai55s4vhpfkhyx4h4hm6dqy4pg4c61pia3innqd4qn";
+    sha256 = "0869j9jn0z5b5pfspp4v5cj2ksmbqmmmjhqicn4kqc6wr6v6md59";
   };
 
-  buildInputs = [ gtk2 xulrunner zip pkgconfig npapi_sdk ];
+  nativeBuildInputs = [ pkgconfig bc perl ];
+  buildInputs = [ gtk2 xulrunner zip npapi_sdk ];
 
   preConfigure = ''
-    substituteInPlace javac.in --replace '#!/usr/bin/perl' '#!${perl}/bin/perl'
-
-    configureFlags="BIN_BASH=${bash}/bin/bash $configureFlags"
+    #patchShebangs javac.in
+    configureFlagsArray+=("BIN_BASH=${bash}/bin/bash")
   '';
 
   configureFlags = [
     "--with-jdk-home=${jdk.home}"
+    "--disable-docs"
   ];
 
   mozillaPlugin = "/lib";