Merge pull request #125006 from astro/frogatto
This commit is contained in:
commit
9a5a639608
|
@ -2,14 +2,14 @@
|
||||||
|
|
||||||
stdenv.mkDerivation {
|
stdenv.mkDerivation {
|
||||||
pname = "frogatto-data";
|
pname = "frogatto-data";
|
||||||
version = "unstable-2018-12-18";
|
version = "unstable-2021-05-24";
|
||||||
|
|
||||||
src = fetchFromGitHub {
|
src = fetchFromGitHub {
|
||||||
owner = "frogatto";
|
owner = "frogatto";
|
||||||
repo = "frogatto";
|
repo = "frogatto";
|
||||||
# master branch as of 2020-12-17
|
# master branch as of 2020-12-17
|
||||||
rev = "c1d0813b3b755a4e232369b6791397ad058efc16";
|
rev = "8b0f2bc8f9f172f6225b8e0d806552cb94f35e2a";
|
||||||
sha256 = "1fhaidd35392zzavp93r6ihyansgkc3m1ilz71ia1zl4n3fbsxjg";
|
sha256 = "09nrna9l1zj2ma2bazdhdvphwy570kfz4br4xgpwq21rsjrvrqiy";
|
||||||
};
|
};
|
||||||
|
|
||||||
installPhase = ''
|
installPhase = ''
|
||||||
|
|
|
@ -34,7 +34,6 @@ in buildEnv {
|
||||||
'';
|
'';
|
||||||
|
|
||||||
meta = with lib; {
|
meta = with lib; {
|
||||||
broken = true;
|
|
||||||
homepage = "https://frogatto.com";
|
homepage = "https://frogatto.com";
|
||||||
description = description;
|
description = description;
|
||||||
license = with licenses; [ cc-by-30 unfree ];
|
license = with licenses; [ cc-by-30 unfree ];
|
||||||
|
|
|
@ -4,17 +4,21 @@
|
||||||
|
|
||||||
stdenv.mkDerivation {
|
stdenv.mkDerivation {
|
||||||
pname = "anura-engine";
|
pname = "anura-engine";
|
||||||
version = "unstable-2018-11-28";
|
version = "unstable-2021-05-24";
|
||||||
|
|
||||||
src = fetchFromGitHub {
|
src = fetchFromGitHub {
|
||||||
owner = "anura-engine";
|
owner = "anura-engine";
|
||||||
repo = "anura";
|
repo = "anura";
|
||||||
# trunk branch as of 2018-11-28
|
rev = "ed50bbfa68a4aa09438d95d39103ec39156d438f";
|
||||||
rev = "a05f413f255d2854019134be817c253a03da3d9f";
|
sha256 = "0bk0qklk9wwx3jr2kbrmansccn1nj962v5n2vlb5hxsrcv96s3dg";
|
||||||
sha256 = "1hd57q8gbn1zdpibnqd3ma0z1ycayc2f4r9j4m2m9kc6yf4v7w7b";
|
|
||||||
fetchSubmodules = true;
|
fetchSubmodules = true;
|
||||||
};
|
};
|
||||||
|
|
||||||
|
postPatch = ''
|
||||||
|
substituteInPlace src/sys.cpp \
|
||||||
|
--replace mallinfo2 mallinfo
|
||||||
|
'';
|
||||||
|
|
||||||
nativeBuildInputs = [
|
nativeBuildInputs = [
|
||||||
which pkg-config
|
which pkg-config
|
||||||
];
|
];
|
||||||
|
|
Loading…
Reference in a new issue