Unverified Commit 948a5e17 authored by Aaron Andersen's avatar Aaron Andersen Committed by GitHub
Browse files

Merge pull request #223915 from McSinyx/flare-1.14 

flare: 1.13.04 -> 1.14
parents ae5a8d73 4ea3cb47

pkgs/games/flare/default.nix

+1 −1
Original line number Diff line number Diff line 
{ lib, buildEnv, callPackage, makeWrapper, Cocoa }:



buildEnv {

  name = "flare-1.13.04";

  name = "flare-1.14";



  paths = [

    (callPackage ./engine.nix { inherit Cocoa; })

pkgs/games/flare/engine.nix

+2 −2
Original line number Diff line number Diff line
@@ -2,13 +2,13 @@ 


stdenv.mkDerivation rec {

  pname = "flare-engine";

  version = "1.13.04";

  version = "1.14";



  src = fetchFromGitHub {

    owner = "flareteam";

    repo = pname;

    rev = "v${version}";

    sha256 = "sha256-GPHPYcW0kBDGpZti2kFggNB4RVK/3eQ53M9mJvJuKXM=";

    hash = "sha256-DIzfTqwZJ8NAPB/TWzvPjepHb7hIbIr+Kk+doXJmpLc=";

  };



  patches = [ ./desktop.patch ];

pkgs/games/flare/game.nix

+2 −2
Original line number Diff line number Diff line
@@ -2,13 +2,13 @@ 


stdenv.mkDerivation rec {

  pname = "flare-game";

  version = "1.13.04";

  version = "1.14";



  src = fetchFromGitHub {

    owner = "flareteam";

    repo = pname;

    rev = "v${version}";

    sha256 = "sha256-7dEIagioM6OZXG+eNaYls8skHXSqGFXZuNhT0zhTFdY=";

    hash = "sha256-tINIwxyQn8eeJCHwRmAMo2TYRgrgJlGaUrnrgbmM3Jo=";

  };



  nativeBuildInputs = [ cmake ];