From ec61ccd52559e5c8f5bd04ddd7421bb864f16df2 Mon Sep 17 00:00:00 2001 From: Francesco Gazzetta Date: Tue, 6 Oct 2020 20:48:06 +0200 Subject: [PATCH 1/2] shattered-pixel-dungeon: 0.8.2d -> 0.9.0b --- pkgs/games/shattered-pixel-dungeon/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/games/shattered-pixel-dungeon/default.nix b/pkgs/games/shattered-pixel-dungeon/default.nix index f3808102bd1..50aca1671f9 100644 --- a/pkgs/games/shattered-pixel-dungeon/default.nix +++ b/pkgs/games/shattered-pixel-dungeon/default.nix @@ -10,13 +10,13 @@ let pname = "shattered-pixel-dungeon"; - version = "0.8.2d"; + version = "0.9.0b"; src = fetchFromGitHub { owner = "00-Evan"; repo = "shattered-pixel-dungeon"; rev = "v${version}"; - sha256 = "11lgalam1aacw01ar7nawiim4pbxqzrdrnxvj6wq9mg83hgsz65l"; + sha256 = "1cjrs1k2wkhaby8qprx2m9nhlcmnbrjlalsaj9vwgq1s7szzl2w4"; }; postPatch = '' From 61b83e68dc040cc1bcfe3234c6d867d72361b13a Mon Sep 17 00:00:00 2001 From: Francesco Gazzetta Date: Wed, 2 Dec 2020 16:36:44 +0100 Subject: [PATCH 2/2] shattered-pixel-dungeon: almost fix darwin build Gradle has some problems with termcap: > FAILURE: Build failed with an exception. > > * What went wrong: > Could not open terminal for stdout: could not get termcap entry see https://github.com/gradle/gradle/issues/4426 Unfortunately before the merge darwin broke again, so while this is now in a better state it is still broken: https://github.com/NixOS/nixpkgs/pull/99885#issuecomment-740065005 --- pkgs/games/shattered-pixel-dungeon/default.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/pkgs/games/shattered-pixel-dungeon/default.nix b/pkgs/games/shattered-pixel-dungeon/default.nix index 50aca1671f9..c49daa3b69a 100644 --- a/pkgs/games/shattered-pixel-dungeon/default.nix +++ b/pkgs/games/shattered-pixel-dungeon/default.nix @@ -34,6 +34,8 @@ let nativeBuildInputs = [ gradle_5 perl ]; buildPhase = '' export GRADLE_USER_HOME=$(mktemp -d) + # https://github.com/gradle/gradle/issues/4426 + ${stdenv.lib.optionalString stdenv.isDarwin "export TERM=dumb"} gradle --no-daemon desktop:release ''; # perl code mavenizes pathes (com.squareup.okio/okio/1.13.0/a9283170b7305c8d92d25aff02a6ab7e45d06cbe/okio-1.13.0.jar -> com/squareup/okio/okio/1.13.0/okio-1.13.0.jar) @@ -54,6 +56,8 @@ in stdenv.mkDerivation rec { buildPhase = '' export GRADLE_USER_HOME=$(mktemp -d) + # https://github.com/gradle/gradle/issues/4426 + ${stdenv.lib.optionalString stdenv.isDarwin "export TERM=dumb"} # point to offline repo sed -ie "s#repositories {#repositories { maven { url '${deps}' };#g" build.gradle gradle --offline --no-daemon desktop:release @@ -78,6 +82,8 @@ in stdenv.mkDerivation rec { license = licenses.gpl3; maintainers = with maintainers; [ fgaz ]; platforms = platforms.all; + # https://github.com/NixOS/nixpkgs/pull/99885#issuecomment-740065005 + broken = stdenv.isDarwin; }; }