BoomMicrophone/nixpkgs-suyu
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

flare: add darwin support

Browse source
This commit is contained in:
Aaron Andersen 2019-08-03 08:12:24 -04:00
parent 14e3ee4860
commit 3c1458c065
3 changed files with 8 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
pkgs/games/flare/default.nix
View file

@ -1,10 +1,10 @@
{ lib, buildEnv, callPackage, makeWrapper }:
{ lib, buildEnv, callPackage, makeWrapper, Cocoa }:
buildEnv {
name = "flare-1.11";
paths = [
(callPackage ./engine.nix {})
(callPackage ./engine.nix { inherit Cocoa; })
(callPackage ./game.nix {})
];

5
pkgs/games/flare/engine.nix
View file

@ -1,4 +1,4 @@
{ stdenv, fetchFromGitHub, cmake, SDL2, SDL2_image, SDL2_mixer, SDL2_ttf }:
{ stdenv, fetchFromGitHub, cmake, SDL2, SDL2_image, SDL2_mixer, SDL2_ttf, Cocoa }:
stdenv.mkDerivation rec {
pname = "flare-engine";
@ -12,7 +12,8 @@ stdenv.mkDerivation rec {
};
nativeBuildInputs = [ cmake ];
buildInputs = [ SDL2 SDL2_image SDL2_mixer SDL2_ttf ];
buildInputs = [ SDL2 SDL2_image SDL2_mixer SDL2_ttf ]
++ stdenv.lib.optional stdenv.isDarwin Cocoa;
meta = with stdenv.lib; {
description = "Free/Libre Action Roleplaying Engine";

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

@ -2997,7 +2997,9 @@ in
flannel = callPackage ../tools/networking/flannel { };
flare = callPackage ../games/flare { };
flare = callPackage ../games/flare {
inherit (darwin.apple_sdk.frameworks) Cocoa;
};
flashbench = callPackage ../os-specific/linux/flashbench { };