diff options
author | worldofpeace <worldofpeace@users.noreply.github.com> | 2018-12-30 23:08:16 -0500 |
---|---|---|
committer | worldofpeace <worldofpeace@users.noreply.github.com> | 2018-12-31 01:54:02 -0500 |
commit | 39efe3d97d64f157449b0f8d3d49c469630ac448 (patch) | |
tree | 4e2c31826bfe9dd8d218af9fedf1f993a786ff31 | |
parent | aced720cd5991d4413ca18c786421406a5e5bd77 (diff) | |
download | nixpkgs-39efe3d97d64f157449b0f8d3d49c469630ac448.tar nixpkgs-39efe3d97d64f157449b0f8d3d49c469630ac448.tar.gz nixpkgs-39efe3d97d64f157449b0f8d3d49c469630ac448.tar.bz2 nixpkgs-39efe3d97d64f157449b0f8d3d49c469630ac448.tar.lz nixpkgs-39efe3d97d64f157449b0f8d3d49c469630ac448.tar.xz nixpkgs-39efe3d97d64f157449b0f8d3d49c469630ac448.tar.zst nixpkgs-39efe3d97d64f157449b0f8d3d49c469630ac448.zip |
solarus-quest-editor: 1.5.3 -> 1.6.0
3 files changed, 5 insertions, 67 deletions
diff --git a/pkgs/development/tools/solarus-quest-editor/default.nix b/pkgs/development/tools/solarus-quest-editor/default.nix index 5a340d30949..991edf9b568 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"; diff --git a/pkgs/development/tools/solarus-quest-editor/patches/fix-install.patch b/pkgs/development/tools/solarus-quest-editor/patches/fix-install.patch deleted file mode 100644 index 98c26c1a706..00000000000 --- a/pkgs/development/tools/solarus-quest-editor/patches/fix-install.patch +++ /dev/null @@ -1,16 +0,0 @@ -# Description Fix CMakeLists.txt to install binaries. Fixed in 1.5 upstream. -# Author "Nathan R. Moore <natedevv@gmail.com>" ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -359,6 +359,11 @@ - "${MODPLUG_LIBRARY}" - ) - -+# Set files to install -+install(TARGETS solarus-quest-editor -+ RUNTIME DESTINATION bin -+) -+ - # Platform specific. - - # Windows: disable the console. diff --git a/pkgs/development/tools/solarus-quest-editor/patches/partial-f285beab62594f73e57190c49848c848487214cf.patch b/pkgs/development/tools/solarus-quest-editor/patches/partial-f285beab62594f73e57190c49848c848487214cf.patch deleted file mode 100644 index 73e817fcfbe..00000000000 --- a/pkgs/development/tools/solarus-quest-editor/patches/partial-f285beab62594f73e57190c49848c848487214cf.patch +++ /dev/null @@ -1,33 +0,0 @@ -From f285beab62594f73e57190c49848c848487214cf Mon Sep 17 00:00:00 2001 -From: stdgregwar <gregoirehirt@gmail.com> -Date: Sun, 1 Jul 2018 00:00:41 +0200 -Subject: [PATCH] Shader previewer base - - -diff --git a/include/widgets/tileset_view.h b/include/widgets/tileset_view.h -index 615f432..799a4c6 100644 ---- a/include/widgets/tileset_view.h -+++ b/include/widgets/tileset_view.h -@@ -23,6 +23,7 @@ - #include "pattern_separation.h" - #include <QGraphicsView> - #include <QPointer> -+#include <QMenu> - - class QAction; - -diff --git a/src/widgets/text_editor.cpp b/src/widgets/text_editor.cpp -index 4f2ff68..90080a9 100644 ---- a/src/widgets/text_editor.cpp -+++ b/src/widgets/text_editor.cpp -@@ -26,6 +26,7 @@ - #include <QList> - #include <QPlainTextEdit> - #include <QScrollBar> -+#include <QAction> - #include <QTextStream> - #include <QUndoStack> - --- -2.18.0 - |