diff options
| author | John Ericson <John.Ericson@Obsidian.Systems> | 2018-12-20 04:38:17 -0500 |
|---|---|---|
| committer | John Ericson <git@JohnEricson.me> | 2018-12-20 12:17:27 -0500 |
| commit | d5fe4665667c730204c0276b2db176cfb21faf55 (patch) | |
| tree | 587ab3ca6407384ffe384214b7ebad1bdb5ca109 | |
| parent | b513231dc643f65db55bb32a5b25f67925b2fd94 (diff) | |
openspades: Fix Darwin build
| -rw-r--r-- | pkgs/games/openspades/default.nix | 15 | ||||
| -rw-r--r-- | pkgs/top-level/all-packages.nix | 4 |
2 files changed, 16 insertions, 3 deletions
diff --git a/pkgs/games/openspades/default.nix b/pkgs/games/openspades/default.nix index b475726555597..f218ba762ca9a 100644 --- a/pkgs/games/openspades/default.nix +++ b/pkgs/games/openspades/default.nix @@ -1,6 +1,7 @@ -{ stdenv, fetchurl, fetchFromGitHub, cmake, unzip, zip, file +{ stdenv, fetchurl, fetchFromGitHub, fetchpatch, cmake, unzip, zip, file , curl, glew , libGL, SDL2, SDL2_image, zlib, freetype, imagemagick , openal , opusfile, libogg +, Cocoa }: stdenv.mkDerivation rec { @@ -19,6 +20,16 @@ stdenv.mkDerivation rec { buildInputs = [ freetype SDL2 SDL2_image libGL zlib curl glew opusfile openal libogg + ] ++ stdenv.lib.optionals stdenv.hostPlatform.isDarwin [ + Cocoa + ]; + + patches = [ + # https://github.com/yvt/openspades/pull/793 fix Darwin build + (fetchpatch { + url = "https://github.com/yvt/openspades/commit/2d13704fefc475b279337e89057b117f711a35d4.diff"; + sha256 = "1i7rcpjzkjhbv5pp6byzrxv7sb1iamqq5k1vyqlvkbr38k2dz0rv"; + }) ]; cmakeFlags = [ @@ -43,6 +54,6 @@ stdenv.mkDerivation rec { description = "A compatible client of Ace of Spades 0.75"; homepage = "https://github.com/yvt/openspades/"; license = licenses.gpl3; - platforms = platforms.linux; + platforms = platforms.all; }; } diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index fd7559ead149b..190176c0b040f 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -20034,7 +20034,9 @@ with pkgs; openrw = callPackage ../games/openrw { }; - openspades = callPackage ../games/openspades { }; + openspades = callPackage ../games/openspades { + inherit (darwin.apple_sdk.frameworks) Cocoa; + }; openttd = callPackage ../games/openttd { zlib = zlibStatic; |