From 406fefdf835e9bf2740dbb86dbaabd5e088ecc15 Mon Sep 17 00:00:00 2001
From: "William A. Kennington III" <william@wkennington.com>
Date: Wed, 7 Jan 2015 11:26:59 -0800
Subject: [PATCH] icedtea_web: Cleanup java home

---
 pkgs/development/compilers/icedtea-web/default.nix | 2 +-
 pkgs/top-level/all-packages.nix                    | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/compilers/icedtea-web/default.nix b/pkgs/development/compilers/icedtea-web/default.nix
index 34e025c62dd5..ffff81b686a9 100644
--- a/pkgs/development/compilers/icedtea-web/default.nix
+++ b/pkgs/development/compilers/icedtea-web/default.nix
@@ -20,7 +20,7 @@ stdenv.mkDerivation rec {
   '';
 
   configureFlags = [
-    "--with-jdk-home=${jdk}"
+    "--with-jdk-home=${jdk.home}"
   ];
 
   mozillaPlugin = "/lib";
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 7bc27896fe6a..430c9e7899b3 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -3451,7 +3451,7 @@ let
     pkgs.icedtea7_jdk.jre)) // { outputs = [ "jre" ]; };
 
   icedtea7_web = callPackage ../development/compilers/icedtea-web {
-    jdk = "${icedtea7_jdk}/lib/icedtea";
+    jdk = icedtea7_jdk;
     xulrunner = firefox;
   };