Unverified Commit 8a774cb1 authored by Sandro Jäckel's avatar Sandro Jäckel Committed by GitHub
Browse files

Merge pull request #132512 from McSinyx/flare-1.12

flare: 1.12rc2 -> 1.12
parents f88e5224 b38d8b99
Loading
Loading
Loading
Loading
+1 −1
Original line number Diff line number Diff line
{ lib, buildEnv, callPackage, makeWrapper, Cocoa }:

buildEnv {
  name = "flare-1.12rc2";
  name = "flare-1.12";

  paths = [
    (callPackage ./engine.nix { inherit Cocoa; })
+2 −2
Original line number Diff line number Diff line
@@ -2,13 +2,13 @@

stdenv.mkDerivation rec {
  pname = "flare-engine";
  version = "1.12rc2";
  version = "1.12";

  src = fetchFromGitHub {
    owner = "flareteam";
    repo = pname;
    rev = "v${version}";
    sha256 = "10il9dpbcka1w5glmhv48bqwww44csmhq426lvsc7z84444gvvgq";
    sha256 = "0swav6fzz970wj4iic3b7y06haa05720s2wivc8w7wcw9nzcac7j";
  };

  patches = [ ./desktop.patch ];
+2 −2
Original line number Diff line number Diff line
@@ -2,13 +2,13 @@

stdenv.mkDerivation rec {
  pname = "flare-game";
  version = "1.12rc2";
  version = "1.12";

  src = fetchFromGitHub {
    owner = "flareteam";
    repo = pname;
    rev = "v${version}";
    sha256 = "0k9fnbaqfgmih8bd0sh3kbk6f6v74i95wrbkij48gp48pq8yqbf9";
    sha256 = "15k9r7w587pvkzrln0670hhq5fzif8k7xmrhb0nl3z3fi6dw3mmc";
  };

  nativeBuildInputs = [ cmake ];