diff options
author | Jörg Thalheim <Mic92@users.noreply.github.com> | 2020-07-30 12:56:08 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2020-07-30 12:56:08 +0100 |
commit | 8704039c9876b5dc938f76bf895f9f5e61afc68c (patch) | |
tree | cb3b1831235d95573b75b0aa9630c79acdd3a76b /pkgs/games | |
parent | a7888ee7f696092318d0a22ab3b4345ad4cef0be (diff) | |
parent | 5d85ffea09033eea06a1f416c430eee575e3460c (diff) |
Merge pull request #93405 from fgaz/curseofwar/1.3.0
curseofwar,curseofwar-sdl: 1.2.0 -> 1.3.0
Diffstat (limited to 'pkgs/games')
-rw-r--r-- | pkgs/games/curseofwar/default.nix | 18 |
1 files changed, 7 insertions, 11 deletions
diff --git a/pkgs/games/curseofwar/default.nix b/pkgs/games/curseofwar/default.nix index 8b915345f862f..9aff3798b6ba7 100644 --- a/pkgs/games/curseofwar/default.nix +++ b/pkgs/games/curseofwar/default.nix @@ -1,34 +1,30 @@ { 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 ]; - 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"; |