flare: 1.14 -> 1.15
This commit is contained in:
@@ -12,24 +12,17 @@
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "flare-engine";
|
||||
version = "1.14";
|
||||
version = "1.15";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "flareteam";
|
||||
repo = "flare-engine";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-DIzfTqwZJ8NAPB/TWzvPjepHb7hIbIr+Kk+doXJmpLc=";
|
||||
hash = "sha256-QwrSMkJE8dNIODlmdi1c6qgTULhJP9HEV8wI7k5vHAA=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
./desktop.patch
|
||||
|
||||
# cmake-4 compatibility patch
|
||||
(fetchpatch {
|
||||
name = "cmake-4.patch";
|
||||
url = "https://github.com/flareteam/flare-engine/commit/9500379f886484382bba2f893faf49865de9f2c0.patch";
|
||||
hash = "sha256-nUn54ZBEvvFkIhzE/UBbsvF0rFC9JAeQACTAPtsc1VI=";
|
||||
})
|
||||
];
|
||||
|
||||
nativeBuildInputs = [ cmake ];
|
||||
|
||||
@@ -8,23 +8,16 @@
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "flare-game";
|
||||
version = "1.14";
|
||||
version = "1.15";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "flareteam";
|
||||
repo = "flare-game";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-tINIwxyQn8eeJCHwRmAMo2TYRgrgJlGaUrnrgbmM3Jo=";
|
||||
hash = "sha256-IsVfP8wmrublAqoVix7gOA4u8CRmXdyNzagnaXyFsxc=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
# cmake-4 compatibility patch
|
||||
(fetchpatch {
|
||||
name = "cmake-4.patch";
|
||||
url = "https://github.com/flareteam/flare-game/commit/5b61dfd69f4ecbaca6439caa9ae41b3168e4d21a.patch";
|
||||
hash = "sha256-5Um6LWAWQyialzO3KSebmLju0VOuz1S5dzavO9EWlLE=";
|
||||
})
|
||||
];
|
||||
patches = [ ];
|
||||
|
||||
nativeBuildInputs = [ cmake ];
|
||||
|
||||
|
||||
@@ -7,7 +7,7 @@
|
||||
|
||||
buildEnv {
|
||||
pname = "flare";
|
||||
version = "1.14";
|
||||
version = "1.15";
|
||||
|
||||
paths = [
|
||||
(callPackage ./engine.nix { })
|
||||
|
||||
Reference in New Issue
Block a user