JakeHillion/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #52558 from Ericson2314/openspades-darwin

Browse Source 
openspades: Fix Darwin build
This commit is contained in:
John Ericson 2018-12-20 12:18:21 -05:00 committed by GitHub
commit 8a3ad1c79d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 16 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
pkgs/games/openspades/default.nix
View File

@ -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;
};
}

4
pkgs/top-level/all-packages.nix
View File

@ -20778,7 +20778,9 @@ in
openrw = callPackage ../games/openrw { };
openspades = callPackage ../games/openspades { };
openspades = callPackage ../games/openspades {
inherit (darwin.apple_sdk.frameworks) Cocoa;
};
openttd = callPackage ../games/openttd {
zlib = zlib.override {