MirrorHub/nixpkgs
0
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-11-16 14:54:29 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

solarus-quest-editor: 1.4.5 -> 1.5.3

Browse source
This commit is contained in:
Samuel Dionne-Riel 2018-09-04 22:04:33 -04:00
parent 83a0d5d013
commit 455f8151fd
2 changed files with 52 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

27
pkgs/development/tools/solarus-quest-editor/default.nix
View file

@ -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";

33
pkgs/development/tools/solarus-quest-editor/patches/partial-f285beab62594f73e57190c49848c848487214cf.patch Normal file
View file

@ -0,0 +1,33 @@
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