Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 3c493fe6d376
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: f0cf05c4b944
Choose a head ref
  • 3 commits
  • 1 file changed
  • 2 contributors

Commits on Nov 5, 2020

  1. shattered-pixel-dungeon: 0.8.2d -> 0.9.0b

    @fgaz
    fgaz committed Nov 5, 2020
    Copy the full SHA
    ec61ccd View commit details

Commits on Jan 20, 2021

  1. 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 gradle/gradle#4426

Unfortunately before the merge darwin broke again, so while this is now
in a better state it is still broken:
#99885 (comment)
    @fgaz
    fgaz committed Jan 20, 2021
    Copy the full SHA
    61b83e6 View commit details

  2. Merge pull request #99885 from fgaz/shattered-pixel-dungeon/0.9.0

    @SuperSandro2000
    SuperSandro2000 authored Jan 20, 2021
    Copy the full SHA
    f0cf05c View commit details
Showing with 8 additions and 2 deletions.
  1. +8 −2 pkgs/games/shattered-pixel-dungeon/default.nix
10 changes: 8 additions & 2 deletions pkgs/games/shattered-pixel-dungeon/default.nix
View file
Original file line number Diff line number Diff line change
@@ -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 = ''
@@ -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;
};
}