java: More default cleanups

Changed files
+3 -3
nixos
modules
services
search
web-servers
pkgs
tools
graphics
zxing
+1 -1
nixos/modules/services/search/solr.nix
···
javaPackage = mkOption {
type = types.package;
-
default = pkgs.openjre;
description = ''
Which Java derivation to use for running solr.
'';
···
javaPackage = mkOption {
type = types.package;
+
default = pkgs.jre;
description = ''
Which Java derivation to use for running solr.
'';
+1 -1
nixos/modules/services/web-servers/winstone.nix
···
javaPackage = mkOption {
type = types.package;
-
default = pkgs.openjre;
description = ''
Which Java derivation to use for running Winstone.
'';
···
javaPackage = mkOption {
type = types.package;
+
default = pkgs.jre;
description = ''
Which Java derivation to use for running Winstone.
'';
+1 -1
pkgs/tools/graphics/zxing/default.nix
···
-
{stdenv, fetchurl, openjre, jre ? openjre}:
stdenv.mkDerivation rec {
name = "zxing-${version}";
version = "3.1.0";
···
+
{ stdenv, fetchurl, jre }:
stdenv.mkDerivation rec {
name = "zxing-${version}";
version = "3.1.0";