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

Merge pull request #65841 from aanderse/flare

Browse Source 
flare: 1.10 -> 1.11
This commit is contained in:
Robin Gloster 2019-08-03 15:48:27 +00:00 committed by GitHub
commit e1f0d24454
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 13 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
pkgs/games/flare/default.nix
View File

@ -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 {})
];

9
pkgs/games/flare/engine.nix
View File

@ -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";

4
pkgs/games/flare/game.nix
View File

@ -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 ];

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 { };