From c82410eeda78deb3afe898168700772d53361985 Mon Sep 17 00:00:00 2001 From: "William A. Kennington III" Date: Thu, 1 Jan 2015 15:49:20 -0800 Subject: java: Normalize to the default jre / jdk --- nixos/modules/services/search/solr.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'nixos/modules/services/search') diff --git a/nixos/modules/services/search/solr.nix b/nixos/modules/services/search/solr.nix index 38d9dedbe3cf1..bc5cbe83cff67 100644 --- a/nixos/modules/services/search/solr.nix +++ b/nixos/modules/services/search/solr.nix @@ -22,7 +22,7 @@ let cp common/lib/*.jar $out/lib/ ln -s ${pkgs.ant}/lib/ant/lib/ant.jar $out/lib/ ln -s ${cfg.solrPackage}/lib/ext/* $out/lib/ - ln -s ${pkgs.openjdk}/lib/openjdk/lib/tools.jar $out/lib/ + ln -s ${pkgs.jdk.home}/lib/tools.jar $out/lib/ '' + optionalString (cfg.extraJars != []) '' for f in ${concatStringsSep " " cfg.extraJars}; do cp $f $out/lib -- cgit 1.4.1