From dd7efcbf3640080afdf3bd62ad7dd3a2489db18e Mon Sep 17 00:00:00 2001
From: "William A. Kennington III" <william@wkennington.com>
Date: Wed, 7 Jan 2015 11:20:46 -0800
Subject: [PATCH] java: More default cleanups

---
 nixos/modules/services/search/solr.nix          | 2 +-
 nixos/modules/services/web-servers/winstone.nix | 2 +-
 pkgs/tools/graphics/zxing/default.nix           | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/nixos/modules/services/search/solr.nix b/nixos/modules/services/search/solr.nix
index bc5cbe83cff6..7886d1e2e8e6 100644
--- a/nixos/modules/services/search/solr.nix
+++ b/nixos/modules/services/search/solr.nix
@@ -44,7 +44,7 @@ in {
 
       javaPackage = mkOption {
         type = types.package;
-        default = pkgs.openjre;
+        default = pkgs.jre;
         description = ''
           Which Java derivation to use for running solr.
         '';
diff --git a/nixos/modules/services/web-servers/winstone.nix b/nixos/modules/services/web-servers/winstone.nix
index 7f48012f158e..eed16a64f2a8 100644
--- a/nixos/modules/services/web-servers/winstone.nix
+++ b/nixos/modules/services/web-servers/winstone.nix
@@ -30,7 +30,7 @@ let
 
       javaPackage = mkOption {
         type = types.package;
-        default = pkgs.openjre;
+        default = pkgs.jre;
         description = ''
           Which Java derivation to use for running Winstone.
         '';
diff --git a/pkgs/tools/graphics/zxing/default.nix b/pkgs/tools/graphics/zxing/default.nix
index 6834150f4775..df85b4473bb7 100644
--- a/pkgs/tools/graphics/zxing/default.nix
+++ b/pkgs/tools/graphics/zxing/default.nix
@@ -1,4 +1,4 @@
-{stdenv, fetchurl, openjre, jre ? openjre}:
+{ stdenv, fetchurl, jre }:
 stdenv.mkDerivation rec {
   name = "zxing-${version}";
   version = "3.1.0";