From a1db11198e15b87901bbf22f9686e3630f74b491 Mon Sep 17 00:00:00 2001 From: "William A. Kennington III" Date: Fri, 18 Sep 2015 13:09:20 -0700 Subject: [PATCH] icedtea_web: 1.6 -> 1.6.1 --- .../compilers/icedtea-web/default.nix | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/pkgs/development/compilers/icedtea-web/default.nix b/pkgs/development/compilers/icedtea-web/default.nix index f1a7b907815..863c74bc4c1 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";