summary refs log tree commit diff
diff options
context:
space:
mode:
authorGabriel Ebner <gebner@gebner.org>2020-09-19 13:52:36 +0200
committerGabriel Ebner <gebner@gebner.org>2020-09-19 14:06:15 +0200
commitcdcdeb63b2a11c24f5da637351373ffa27a9cb2d (patch)
tree51efba9da8536193d5446992ffb337921bc8f07d
parentcb973a0368d6e7a8fb1d2f1250a0074b393d3812 (diff)
downloadnixpkgs-cdcdeb63b2a11c24f5da637351373ffa27a9cb2d.tar
nixpkgs-cdcdeb63b2a11c24f5da637351373ffa27a9cb2d.tar.gz
nixpkgs-cdcdeb63b2a11c24f5da637351373ffa27a9cb2d.tar.bz2
nixpkgs-cdcdeb63b2a11c24f5da637351373ffa27a9cb2d.tar.lz
nixpkgs-cdcdeb63b2a11c24f5da637351373ffa27a9cb2d.tar.xz
nixpkgs-cdcdeb63b2a11c24f5da637351373ffa27a9cb2d.tar.zst
nixpkgs-cdcdeb63b2a11c24f5da637351373ffa27a9cb2d.zip
dwarf-fortress: use jdk8
-rw-r--r--pkgs/games/dwarf-fortress/default.nix6
1 files changed, 5 insertions, 1 deletions
diff --git a/pkgs/games/dwarf-fortress/default.nix b/pkgs/games/dwarf-fortress/default.nix
index 0664af117e1..2a4df9bf7cf 100644
--- a/pkgs/games/dwarf-fortress/default.nix
+++ b/pkgs/games/dwarf-fortress/default.nix
@@ -86,6 +86,8 @@ let
         twbt = twbt;
         dfhack = dfhack;
         dwarf-therapist = dwarf-therapist;
+
+        jdk = pkgs.jdk8; # TODO: remove override https://github.com/NixOS/nixpkgs/pull/89731
       };
   }) (lib.attrNames self.df-hashes));
 
@@ -104,7 +106,9 @@ let
 
     soundSense = callPackage ./soundsense.nix { };
 
-    legends-browser = callPackage ./legends-browser {};
+    legends-browser = callPackage ./legends-browser {
+      jre = pkgs.jre8; # TODO: remove override https://github.com/NixOS/nixpkgs/pull/89731
+    };
 
     themes = recurseIntoAttrs (callPackage ./themes {
       stdenv = stdenvNoCC;