aboutsummaryrefslogtreecommitdiff
path: root/pkgs/games
diff options
context:
space:
mode:
authorSandro <sandro.jaeckel@gmail.com>2020-12-02 22:04:03 +0100
committerGitHub <noreply@github.com>2020-12-02 22:04:03 +0100
commit0278e49268735919b3af826ae14f18df35ae55df (patch)
treeb07e08ce3772c3d24140eee60485b7549a747e39 /pkgs/games
parent1c95b26cf91244b97795f5f663f3b5ba0d4fc0d9 (diff)
parent298ddbb0493cea2ca9961dd3c36ed8b2c1e37790 (diff)
Merge pull request #105692 from fgaz/mindustry/120.2
Diffstat (limited to 'pkgs/games')
-rw-r--r--pkgs/games/mindustry/default.nix7
1 files changed, 5 insertions, 2 deletions
diff --git a/pkgs/games/mindustry/default.nix b/pkgs/games/mindustry/default.nix
index d87a1cadd989..89ff37458af9 100644
--- a/pkgs/games/mindustry/default.nix
+++ b/pkgs/games/mindustry/default.nix
@@ -22,14 +22,14 @@ let
# Note: when raising the version, ensure that all SNAPSHOT versions in
# build.gradle are replaced by a fixed version
# (the current one at the time of release) (see postPatch).
- version = "120";
+ version = "120.2";
buildVersion = makeBuildVersion version;
src = fetchFromGitHub {
owner = "Anuken";
repo = "Mindustry";
rev = "v${version}";
- sha256 = "08l5c53izh5vmgahsj0qhpfiva0vs5qhh77bb770hzpadxvysyc8";
+ sha256 = "01a7qpwfr1n540fk0k65kl03biix0gmg66z7qn22mb2703laq1xc";
};
desktopItem = makeDesktopItem {
@@ -128,5 +128,8 @@ stdenv.mkDerivation rec {
license = licenses.gpl3;
maintainers = with maintainers; [ fgaz ];
platforms = platforms.all;
+ # Hash mismatch on darwin:
+ # https://github.com/NixOS/nixpkgs/pull/105590#issuecomment-737120293
+ broken = stdenv.isDarwin;
};
}