From 68b7fc27c4dc01817a4461c110000cdf8817cb39 Mon Sep 17 00:00:00 2001 From: Francesco Gazzetta Date: Sat, 18 Jul 2020 12:39:10 +0200 Subject: [PATCH 1/2] curseofwar,curseofwar-sdl: 1.2.0 -> 1.3.0 --- pkgs/games/curseofwar/default.nix | 12 ++---------- 1 file changed, 2 insertions(+), 10 deletions(-) diff --git a/pkgs/games/curseofwar/default.nix b/pkgs/games/curseofwar/default.nix index 8b915345f86..2dbb667cc70 100644 --- a/pkgs/games/curseofwar/default.nix +++ b/pkgs/games/curseofwar/default.nix @@ -1,28 +1,20 @@ { stdenv , fetchFromGitHub -, fetchpatch , ncurses , SDL }: stdenv.mkDerivation rec { pname = "curseofwar"; - version = "1.2.0"; + version = "1.3.0"; src = fetchFromGitHub { owner = "a-nikolaev"; repo = pname; rev = "v${version}"; - sha256 = "1bj3lv5vrnwzzkgj31pyf1lzkz10qphvzlfz7a3j4plqkczjq92y"; + sha256 = "1wd71wdnj9izg5d95m81yx3684g4zdi7fsy0j5wwnbd9j34ilz1i"; }; - patches = [(fetchpatch { - # Pull request #40: https://github.com/a-nikolaev/curseofwar/pull/40 - name = "prefix-independent-data"; - url = "https://github.com/fgaz/curseofwar/commit/947dea527b2bf4c6e107b8e9c66f4c4fd775b6f9.patch"; - sha256 = "0ak5igaxmbavkbl8101xx6gswhwgzm5f6wyplwapgh7cylnclc61"; - })]; - buildInputs = [ ncurses SDL From 5d85ffea09033eea06a1f416c430eee575e3460c Mon Sep 17 00:00:00 2001 From: Francesco Gazzetta Date: Thu, 30 Jul 2020 10:49:09 +0200 Subject: [PATCH 2/2] curseofwar,curseofwar-sdl: fix darwin build --- pkgs/games/curseofwar/default.nix | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/pkgs/games/curseofwar/default.nix b/pkgs/games/curseofwar/default.nix index 2dbb667cc70..9aff3798b6b 100644 --- a/pkgs/games/curseofwar/default.nix +++ b/pkgs/games/curseofwar/default.nix @@ -20,7 +20,11 @@ stdenv.mkDerivation rec { SDL ]; - makeFlags = (if isNull SDL then [] else [ "SDL=yes" ]) ++ [ "PREFIX=$(out)" ]; + makeFlags = (if isNull SDL then [] else [ "SDL=yes" ]) ++ [ + "PREFIX=$(out)" + # force platform's cc on darwin, otherwise gcc is used + "CC=${stdenv.cc.targetPrefix}cc" + ]; meta = with stdenv.lib; { description = "A fast-paced action strategy game";