goxel: 0.10.8 -> 0.12.0
This commit is contained in:
parent
8c57d13c13
commit
49410a7a6b
@ -3,27 +3,18 @@
|
|||||||
|
|
||||||
stdenv.mkDerivation rec {
|
stdenv.mkDerivation rec {
|
||||||
pname = "goxel";
|
pname = "goxel";
|
||||||
version = "0.10.8";
|
version = "0.12.0";
|
||||||
|
|
||||||
src = fetchFromGitHub {
|
src = fetchFromGitHub {
|
||||||
owner = "guillaumechereau";
|
owner = "guillaumechereau";
|
||||||
repo = "goxel";
|
repo = "goxel";
|
||||||
rev = "v${version}";
|
rev = "v${version}";
|
||||||
sha256 = "sha256-M9H9SV8xmU7Jw5rEdV0gfloIEBvWmWSuH+BCrowpf2M=";
|
hash = "sha256-taDe5xJU6ijikHaSMDYs/XE2O66X3J7jOKWzbj7hrN0=";
|
||||||
};
|
};
|
||||||
|
|
||||||
patches = [ ./disable-imgui_ini.patch ];
|
|
||||||
|
|
||||||
nativeBuildInputs = [ scons pkg-config wrapGAppsHook ];
|
nativeBuildInputs = [ scons pkg-config wrapGAppsHook ];
|
||||||
buildInputs = [ glfw3 gtk3 libpng12 ];
|
buildInputs = [ glfw3 gtk3 libpng12 ];
|
||||||
|
|
||||||
env.NIX_CFLAGS_COMPILE = toString [
|
|
||||||
# Needed with GCC 12
|
|
||||||
"-Wno-error=format-truncation"
|
|
||||||
];
|
|
||||||
|
|
||||||
NIX_LDFLAGS = "-lpthread";
|
|
||||||
|
|
||||||
buildPhase = ''
|
buildPhase = ''
|
||||||
make release
|
make release
|
||||||
'';
|
'';
|
||||||
|
@ -1,13 +0,0 @@
|
|||||||
diff --git a/src/gui.cpp b/src/gui.cpp
|
|
||||||
index 9b7236c..a8a11b2 100644
|
|
||||||
--- a/src/gui.cpp
|
|
||||||
+++ b/src/gui.cpp
|
|
||||||
@@ -314,6 +314,8 @@ static void init_ImGui(const inputs_t *inputs)
|
|
||||||
ImGuiIO& io = ImGui::GetIO();
|
|
||||||
io.DeltaTime = 1.0f/60.0f;
|
|
||||||
|
|
||||||
+ io.IniFilename = NULL;
|
|
||||||
+
|
|
||||||
io.KeyMap[ImGuiKey_Tab] = KEY_TAB;
|
|
||||||
io.KeyMap[ImGuiKey_LeftArrow] = KEY_LEFT;
|
|
||||||
io.KeyMap[ImGuiKey_RightArrow] = KEY_RIGHT;
|
|
Loading…
Reference in New Issue
Block a user