uboot: (firmwareOdroidC2/C4) don't invoke patch tool, use patches = [] instead

https://github.com/NixOS/nixpkgs/blob/master/pkgs/stdenv/generic/setup.sh#L948
this can do it nicely.

Signed-off-by: Anton Arapov <anton@deadbeef.mx>
This commit is contained in:
Anton Arapov 2021-04-03 12:58:10 +02:00 committed by Alan Daniels
commit 56de2bcd43
30691 changed files with 3076956 additions and 0 deletions

View file

@ -0,0 +1,36 @@
{ lib, stdenv, fetchFromGitHub, scons, pkg-config, wrapGAppsHook
, glfw3, gtk3, libpng12 }:
stdenv.mkDerivation rec {
pname = "goxel";
version = "0.10.8";
src = fetchFromGitHub {
owner = "guillaumechereau";
repo = "goxel";
rev = "v${version}";
sha256 = "sha256-M9H9SV8xmU7Jw5rEdV0gfloIEBvWmWSuH+BCrowpf2M=";
};
patches = [ ./disable-imgui_ini.patch ];
nativeBuildInputs = [ scons pkg-config wrapGAppsHook ];
buildInputs = [ glfw3 gtk3 libpng12 ];
NIX_LDFLAGS = "-lpthread";
buildPhase = ''
make release
'';
installPhase = ''
install -D ./goxel $out/bin/goxel
'';
meta = with lib; {
description = "Open Source 3D voxel editor";
homepage = "https://guillaumechereau.github.io/goxel/";
license = licenses.gpl3;
platforms = platforms.linux;
maintainers = with maintainers; [ tilpner ];
};
}

View file

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