diff --git a/pkgs/games/flare/default.nix b/pkgs/games/flare/default.nix index 5ae656d1fc1..551276b1b25 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.10"; + 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 8b620835f85..74f983c6441 100644 --- a/pkgs/games/flare/engine.nix +++ b/pkgs/games/flare/engine.nix @@ -1,18 +1,19 @@ -{ 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"; - version = "1.10"; + version = "1.11"; src = fetchFromGitHub { owner = "flareteam"; repo = pname; rev = "v${version}"; - sha256 = "0fm7jmxl86h8199nazdi9ivsrhcv9gcymhz1l5c6l2f4d0aqdqiq"; + sha256 = "1j6raymz128miq517h9drks4gj79dajw3lsr0msqxz0z3zm6cc4n"; }; 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/games/flare/game.nix b/pkgs/games/flare/game.nix index b10d7dfedb0..6a231a5ff7d 100644 --- a/pkgs/games/flare/game.nix +++ b/pkgs/games/flare/game.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "flare-game"; - version = "1.10"; + version = "1.11"; src = fetchFromGitHub { owner = "flareteam"; repo = pname; rev = "v${version}"; - sha256 = "1lfra4ww8za08vcgza2jvh3jrwi6zryk4ljyj32lpp9v4ws9hdh4"; + sha256 = "18m2qfbbaqklm20gnr7wzrwbmylp1jh781a4p1dq0hymqcg92x5l"; }; nativeBuildInputs = [ cmake ]; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 1a2a88705d8..05f7dba952b 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 { };