From 75707b748ce20c80eb78c4235f96c0bd83ca829a Mon Sep 17 00:00:00 2001 From: Robin Gloster Date: Tue, 28 Feb 2017 17:33:31 +0100 Subject: [PATCH] lincity: fix build --- pkgs/games/lincity/default.nix | 23 ++++++++++++++++++----- 1 file changed, 18 insertions(+), 5 deletions(-) diff --git a/pkgs/games/lincity/default.nix b/pkgs/games/lincity/default.nix index dba488016b9..1c433965c78 100644 --- a/pkgs/games/lincity/default.nix +++ b/pkgs/games/lincity/default.nix @@ -1,20 +1,33 @@ -{ stdenv, fetchurl, libX11, libXext, xextproto, libICE, libSM, xproto, libpng, zlib }: +{ stdenv, fetchurl, fetchpatch, libX11, libXext, xextproto, libICE, libSM, xproto, libpng12, zlib }: stdenv.mkDerivation rec { name = "lincity-${version}"; - version = "1.12.1"; + version = "1.13.1"; src = fetchurl { url = "mirror://sourceforge/lincity/${name}.tar.gz"; - sha256 = "0xmrp7vkkp1hfblb6nl3rh2651qsbcm21bnncpnma1sf40jaf8wj"; + sha256 = "0p81wl7labyfb6rgp0hi42l2akn3n7r2bnxal1wyvjylzw8vsk3v"; }; buildInputs = [ - libICE libpng libSM libX11 libXext + libICE libpng12 libSM libX11 libXext xextproto zlib xproto ]; - meta = { + patches = [ + (fetchpatch { + url = "https://sources.debian.net/data/main/l/lincity/1.13.1-13/debian/patches/extern-inline-functions-777982"; + sha256 = "06dp3zwk0z5wr5a3xaaj2my75vcjcy98vc22hsag7ggd9jwrkcp0"; + }) + (fetchpatch { + url = "https://sources.debian.net/data/main/l/lincity/1.13.1-13/debian/patches/clang-ftbfs-757859"; + sha256 = "098rnywcsyc0m11x4a5m3dza8i0jmfh6pacfgma1vvxpsfkb6ngp"; + }) + ]; + + meta = with stdenv.lib; { description = "City simulation game"; + license = licenses.gpl2Plus; + homepage = "https://sourceforge.net/projects/lincity"; }; }