From cfff8c7883050d8f5b74c00af628ed3d8fcd9160 Mon Sep 17 00:00:00 2001 From: Taran Lynn Date: Wed, 5 Feb 2020 00:56:03 -0800 Subject: [PATCH] redeclipse: 1.6.0 -> 2.0.0 --- pkgs/games/redeclipse/default.nix | 19 +++++-------------- 1 file changed, 5 insertions(+), 14 deletions(-) diff --git a/pkgs/games/redeclipse/default.nix b/pkgs/games/redeclipse/default.nix index 3002fc75e63..b9dd36903ae 100644 --- a/pkgs/games/redeclipse/default.nix +++ b/pkgs/games/redeclipse/default.nix @@ -1,19 +1,19 @@ { stdenv, fetchFromGitHub, fetchurl, fetchpatch -, curl, ed, pkgconfig, zlib, libX11 +, curl, ed, pkgconfig, freetype, zlib, libX11 , SDL2, SDL2_image, SDL2_mixer }: stdenv.mkDerivation rec { pname = "redeclipse"; - version = "1.6.0"; + version = "2.0.0"; src = fetchurl { url = "https://github.com/redeclipse/base/releases/download/v${version}/redeclipse_${version}_nix.tar.bz2"; - sha256 = "0j98zk7nivdsap4y50dlqnql17hdila1ikvps6vicwaqb3l4gaa8"; + sha256 = "143i713ggbk607qr4n39pi0pn8d93x9x6fcbh8rc51jb9qhi8p5i"; }; buildInputs = [ - libX11 zlib + libX11 freetype zlib SDL2 SDL2_image SDL2_mixer ]; @@ -23,15 +23,6 @@ stdenv.mkDerivation rec { makeFlags = [ "-C" "src/" "prefix=$(out)" ]; - patches = [ - # "remove gamma name hack" - Can't find `____gammaf128_r_finite` otherwise - # Is likely to be included in next release - (fetchpatch { - url = "https://github.com/red-eclipse/base/commit/b16b4963c1ad81bb9ef784bc4913a4c8ab5f1bb4.diff"; - sha256 = "1bm07qrq60bbmbf5k9255qq115mcyfphfy2f7xl1yx40mb9ns65p"; - }) - ]; - enableParallelBuilding = true; installTargets = [ "system-install" ]; @@ -49,7 +40,7 @@ stdenv.mkDerivation rec { environments. ''; homepage = "https://www.redeclipse.net"; - license = with licenses; [ licenses.zlib cc-by-sa-30 ]; + license = with licenses; [ zlib cc-by-sa-30 ]; maintainers = with maintainers; [ lambda-11235 ]; platforms = platforms.linux; hydraPlatforms = [];