summary refs log tree commit diff
path: root/pkgs/development/libraries/java
diff options
context:
space:
mode:
authorRoland Synnestvedt <contact@rsynnest.com>2021-07-13 10:09:12 -0700
committerRoland Synnestvedt <contact@rsynnest.com>2021-07-13 10:09:12 -0700
commitfa8f004781886bff95fa4044077504e430470a7f (patch)
treebc4e51b5bb90352321d2fdf06d8e332acaf7fe44 /pkgs/development/libraries/java
parentb562ae6c319a0ee47f297c3b71ed13385c4549d8 (diff)
parente223f84cd8c279b892c53f5d779d6e63eb4277eb (diff)
downloadnixpkgs-fa8f004781886bff95fa4044077504e430470a7f.tar
nixpkgs-fa8f004781886bff95fa4044077504e430470a7f.tar.gz
nixpkgs-fa8f004781886bff95fa4044077504e430470a7f.tar.bz2
nixpkgs-fa8f004781886bff95fa4044077504e430470a7f.tar.lz
nixpkgs-fa8f004781886bff95fa4044077504e430470a7f.tar.xz
nixpkgs-fa8f004781886bff95fa4044077504e430470a7f.tar.zst
nixpkgs-fa8f004781886bff95fa4044077504e430470a7f.zip
Merge branch 'master' of https://github.com/nixos/nixpkgs
Diffstat (limited to 'pkgs/development/libraries/java')
-rw-r--r--pkgs/development/libraries/java/saxon/default.nix6
1 files changed, 4 insertions, 2 deletions
diff --git a/pkgs/development/libraries/java/saxon/default.nix b/pkgs/development/libraries/java/saxon/default.nix
index e6f2fcadbe7..da1e6120da6 100644
--- a/pkgs/development/libraries/java/saxon/default.nix
+++ b/pkgs/development/libraries/java/saxon/default.nix
@@ -1,7 +1,7 @@
-{ lib, stdenv, fetchurl, unzip, jre }:
+{ lib, stdenv, fetchurl, unzip, jre, jre8 }:
 
 let
-  common = { pname, version, src, description
+  common = { pname, version, src, description, java ? jre
            , prog ? null, jar ? null, license ? lib.licenses.mpl20 }:
     stdenv.mkDerivation {
       name = "${pname}-${version}";
@@ -45,6 +45,7 @@ in {
     description = "XSLT 1.0 processor";
     # http://saxon.sourceforge.net/saxon6.5.3/conditions.html
     license = lib.licenses.mpl10;
+    java = jre8;
   };
 
   saxonb_8_8 = common {
@@ -56,6 +57,7 @@ in {
       sha256 = "15bzrfyd2f1045rsp9dp4znyhmizh1pm97q8ji2bc0b43q23xsb8";
     };
     description = "Complete and conformant processor of XSLT 2.0, XQuery 1.0, and XPath 2.0";
+    java = jre8;
   };
 
   saxonb_9_1 = common {