From 3c1458c065c2fd94021b24b1cc2ad2308eb1fd7f Mon Sep 17 00:00:00 2001 From: Aaron Andersen Date: Sat, 3 Aug 2019 08:12:24 -0400 Subject: flare: add darwin support --- pkgs/games/flare/default.nix | 4 ++-- pkgs/games/flare/engine.nix | 5 +++-- 2 files changed, 5 insertions(+), 4 deletions(-) (limited to 'pkgs/games/flare') diff --git a/pkgs/games/flare/default.nix b/pkgs/games/flare/default.nix index 28d8a17638a9..551276b1b25d 100644 --- a/pkgs/games/flare/default.nix +++ b/pkgs/games/flare/default.nix @@ -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 {}) ]; diff --git a/pkgs/games/flare/engine.nix b/pkgs/games/flare/engine.nix index 526951921dba..74f983c64413 100644 --- a/pkgs/games/flare/engine.nix +++ b/pkgs/games/flare/engine.nix @@ -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"; -- cgit 1.4.1