diff options
| author | Rick van Schijndel <rol3517@gmail.com> | 2021-11-23 23:34:50 +0100 |
|---|---|---|
| committer | Rick van Schijndel <rol3517@gmail.com> | 2021-11-23 23:41:24 +0100 |
| commit | 4179df352ba3d2dabf7039b795bebf5068283c28 (patch) | |
| tree | e661c79f8c1cbe8d2a6b606e3d6c322cb6bdcb6a /pkgs/games/mindustry | |
| parent | a77943c99ae0a2c6cc465d084aec0ca269ba5b91 (diff) | |
| download | nixpkgs-4179df352ba3d2dabf7039b795bebf5068283c28.tar nixpkgs-4179df352ba3d2dabf7039b795bebf5068283c28.tar.gz nixpkgs-4179df352ba3d2dabf7039b795bebf5068283c28.tar.bz2 nixpkgs-4179df352ba3d2dabf7039b795bebf5068283c28.tar.lz nixpkgs-4179df352ba3d2dabf7039b795bebf5068283c28.tar.xz nixpkgs-4179df352ba3d2dabf7039b795bebf5068283c28.tar.zst nixpkgs-4179df352ba3d2dabf7039b795bebf5068283c28.zip | |
mindustry: fix eval error due to #119444
The PR https://github.com/NixOS/nixpkgs/pull/119444 broke the build for mindustry even further. This patch fixes that again so it evals and builds properly.
Diffstat (limited to 'pkgs/games/mindustry')
| -rw-r--r-- | pkgs/games/mindustry/default.nix | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/pkgs/games/mindustry/default.nix b/pkgs/games/mindustry/default.nix index 92436128437..09507954670 100644 --- a/pkgs/games/mindustry/default.nix +++ b/pkgs/games/mindustry/default.nix @@ -4,7 +4,7 @@ , copyDesktopItems , fetchFromGitHub , gradle_6 -, jdk11 +, jdk , perl # for arc @@ -87,8 +87,7 @@ let popd ''; - jdk = jdk11; - gradle = (gradle_6.override (old: { java = jdk11; })); + gradle = (gradle_6.override (old: { java = jdk; })); # fake build to pre-download deps into fixed-output derivation deps = stdenv.mkDerivation { |