Merge pull request #114760 from fgaz/shattered-pixel-dungeon/0.9.2

shattered-pixel-dungeon: 0.9.1d -> 0.9.2
This commit is contained in:
Sandro 2021-03-01 16:57:12 +01:00 committed by GitHub
commit aafd6e5925
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23

View file

@ -2,7 +2,7 @@
, makeWrapper
, fetchFromGitHub
, nixosTests
, gradle_5
, gradle
, perl
, jre
, libpulseaudio
@ -10,13 +10,15 @@
let
pname = "shattered-pixel-dungeon";
version = "0.9.1d";
version = "0.9.2";
src = fetchFromGitHub {
owner = "00-Evan";
repo = "shattered-pixel-dungeon";
rev = "v${version}";
sha256 = "0f9vi1iffh477zi03hi07rmfbkb8i4chwvv43vs70mgjh4qx7247";
# NOTE: always use the commit sha, not the tag. Tags _will_ disappear!
# https://github.com/00-Evan/shattered-pixel-dungeon/issues/596
rev = "5be9ee815f1fc6e3511a09a367d3f9d8dc55c783";
sha256 = "0wknrf7jjnkshj4gmb1ksqiqif1rq53ffi3y29ynhcz68sa0frx6";
};
postPatch = ''
@ -31,7 +33,7 @@ let
deps = stdenv.mkDerivation {
pname = "${pname}-deps";
inherit version src postPatch;
nativeBuildInputs = [ gradle_5 perl ];
nativeBuildInputs = [ gradle perl ];
buildPhase = ''
export GRADLE_USER_HOME=$(mktemp -d)
# https://github.com/gradle/gradle/issues/4426
@ -52,7 +54,7 @@ let
in stdenv.mkDerivation rec {
inherit pname version src postPatch;
nativeBuildInputs = [ gradle_5 perl makeWrapper ];
nativeBuildInputs = [ gradle perl makeWrapper ];
buildPhase = ''
export GRADLE_USER_HOME=$(mktemp -d)
@ -86,4 +88,3 @@ in stdenv.mkDerivation rec {
broken = stdenv.isDarwin;
};
}