diff options
author | Aaron Andersen <aaron@fosslib.net> | 2019-08-03 08:12:24 -0400 |
---|---|---|
committer | Aaron Andersen <aaron@fosslib.net> | 2019-08-03 08:12:24 -0400 |
commit | 3c1458c065c2fd94021b24b1cc2ad2308eb1fd7f (patch) | |
tree | 33d41b4c059dc0d2167b6a5afee0999a491cdd4a /pkgs | |
parent | 14e3ee4860be2d1828501ceb60cc5ac1102a3399 (diff) |
flare: add darwin support
Diffstat (limited to 'pkgs')
-rw-r--r-- | pkgs/games/flare/default.nix | 4 | ||||
-rw-r--r-- | pkgs/games/flare/engine.nix | 5 | ||||
-rw-r--r-- | pkgs/top-level/all-packages.nix | 4 |
3 files changed, 8 insertions, 5 deletions
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"; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 1d4295586fa2..1b9e3dad000c 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -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 { }; |