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

openrw: move cmake to nativeBuildInputs, fix on darwin

Browse Source 
Darwin fix as suggested by @risicle
This commit is contained in:
Dmitry Kalinkin 2019-10-29 12:59:06 -04:00
parent 3affc7fb8f
commit ddbf53b855
No known key found for this signature in database
GPG Key ID: 5157B3EC8B2CA333
2 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
pkgs/games/openrw/default.nix
View File

@ -1,5 +1,5 @@
{ stdenv, fetchgit, cmake, sfml, libGLU_combined, bullet, glm, libmad, xlibsWrapper, openal { stdenv, fetchgit, cmake, sfml, libGLU_combined, bullet, glm, libmad, xlibsWrapper, openal
, SDL2, boost, ffmpeg }: , SDL2, boost, ffmpeg, Cocoa, OpenAL }:
stdenv.mkDerivation { stdenv.mkDerivation {
version = "2019-10-26"; version = "2019-10-26";
@ -12,9 +12,11 @@ stdenv.mkDerivation {
fetchSubmodules = true; fetchSubmodules = true;
}; };
nativeBuildInputs = [ cmake ];
buildInputs = [ buildInputs = [
cmake sfml libGLU_combined bullet glm libmad xlibsWrapper openal SDL2 boost ffmpeg sfml libGLU_combined bullet glm libmad xlibsWrapper openal SDL2 boost ffmpeg
]; ] ++ stdenv.lib.optionals stdenv.isDarwin [ OpenAL Cocoa ];
meta = with stdenv.lib; { meta = with stdenv.lib; {
description = "Unofficial open source recreation of the classic Grand Theft Auto III game executable"; description = "Unofficial open source recreation of the classic Grand Theft Auto III game executable";

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

@ -22545,7 +22545,9 @@ in
openra = openraPackages.engines.release; openra = openraPackages.engines.release;
openrw = callPackage ../games/openrw { }; openrw = callPackage ../games/openrw {
inherit (darwin.apple_sdk.frameworks) Cocoa OpenAL;
};
openspades = callPackage ../games/openspades { openspades = callPackage ../games/openspades {
inherit (darwin.apple_sdk.frameworks) Cocoa; inherit (darwin.apple_sdk.frameworks) Cocoa;