diff options
Diffstat (limited to 'pkgs/development/tools/solarus-quest-editor/default.nix')
-rw-r--r-- | pkgs/development/tools/solarus-quest-editor/default.nix | 23 |
1 files changed, 5 insertions, 18 deletions
diff --git a/pkgs/development/tools/solarus-quest-editor/default.nix b/pkgs/development/tools/solarus-quest-editor/default.nix index 5a340d309495..991edf9b568f 100644 --- a/pkgs/development/tools/solarus-quest-editor/default.nix +++ b/pkgs/development/tools/solarus-quest-editor/default.nix @@ -1,36 +1,23 @@ { stdenv, fetchFromGitLab, cmake, luajit, SDL2, SDL2_image, SDL2_ttf, physfs, openal, libmodplug, libvorbis, solarus, - qtbase, qttools, fetchpatch }: + qtbase, qttools, fetchpatch, glm }: stdenv.mkDerivation rec { name = "solarus-quest-editor-${version}"; - version = "1.5.3"; + version = "1.6.0"; src = fetchFromGitLab { owner = "solarus-games"; repo = "solarus-quest-editor"; - rev = "v1.5.3"; - sha256 = "1b9mg04yy4pnrl745hbc82rz79k0f8ci3wv7gvsm3a998q8m98si"; + rev = "v${version}"; + sha256 = "1a7816kaljfh9ynzy9g36mqzzv2p800nnbrja73q6vjfrsv3vq4c"; }; buildInputs = [ cmake luajit SDL2 SDL2_image SDL2_ttf physfs openal libmodplug libvorbis - solarus qtbase qttools ]; - - 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"; - }) - ]; + solarus qtbase qttools glm ]; meta = with stdenv.lib; { description = "The editor for the Zelda-like ARPG game engine, Solarus"; |