diff options
Diffstat (limited to 'pkgs/development/tools/solarus-quest-editor/default.nix')
-rw-r--r-- | pkgs/development/tools/solarus-quest-editor/default.nix | 27 |
1 files changed, 19 insertions, 8 deletions
diff --git a/pkgs/development/tools/solarus-quest-editor/default.nix b/pkgs/development/tools/solarus-quest-editor/default.nix index 3df6d3de3e16..5a340d309495 100644 --- a/pkgs/development/tools/solarus-quest-editor/default.nix +++ b/pkgs/development/tools/solarus-quest-editor/default.nix @@ -1,17 +1,17 @@ -{ stdenv, fetchFromGitHub, cmake, luajit, +{ stdenv, fetchFromGitLab, cmake, luajit, SDL2, SDL2_image, SDL2_ttf, physfs, openal, libmodplug, libvorbis, solarus, - qtbase, qttools }: + qtbase, qttools, fetchpatch }: stdenv.mkDerivation rec { name = "solarus-quest-editor-${version}"; - version = "1.4.5"; + version = "1.5.3"; - src = fetchFromGitHub { - owner = "christopho"; + src = fetchFromGitLab { + owner = "solarus-games"; repo = "solarus-quest-editor"; - rev = "61f0fa7a5048994fcd9c9f3a3d1255d0be2967df"; - sha256 = "1fpq55nvs5k2rxgzgf39c069rmm73vmv4gr5lvmqzgsz07rkh07f"; + rev = "v1.5.3"; + sha256 = "1b9mg04yy4pnrl745hbc82rz79k0f8ci3wv7gvsm3a998q8m98si"; }; buildInputs = [ cmake luajit SDL2 @@ -19,7 +19,18 @@ stdenv.mkDerivation rec { openal libmodplug libvorbis solarus qtbase qttools ]; - patches = [ ./patches/fix-install.patch ]; + patches = [ + ./patches/fix-install.patch + + # Next two patches should be fine to remove for next release. + # This commit fixes issues AND adds features *sighs* + ./patches/partial-f285beab62594f73e57190c49848c848487214cf.patch + + (fetchpatch { + url = https://gitlab.com/solarus-games/solarus-quest-editor/commit/8f308463030c18cd4f7c8a6052028fff3b7ca35a.patch; + sha256 = "1jq48ghhznrp47q9lq2rhh48a1z4aylyy4qaniaqyfyq3vihrchr"; + }) + ]; meta = with stdenv.lib; { description = "The editor for the Zelda-like ARPG game engine, Solarus"; |