diff options
| author | Francesco Gazzetta <fgaz@fgaz.me> | 2023-04-02 14:01:09 +0200 |
|---|---|---|
| committer | Francesco Gazzetta <fgaz@fgaz.me> | 2023-04-02 14:25:55 +0200 |
| commit | 49410a7a6b068ae23f2247e3f9b24d47135d8ed0 (patch) | |
| tree | 3f6e819285f990be2b530ce9aea2e0c7da054f15 | |
| parent | 8c57d13c13ac38814ed99afe87d5c9984fdaa3c7 (diff) | |
| download | nixpkgs-49410a7a6b068ae23f2247e3f9b24d47135d8ed0.tar nixpkgs-49410a7a6b068ae23f2247e3f9b24d47135d8ed0.tar.gz nixpkgs-49410a7a6b068ae23f2247e3f9b24d47135d8ed0.tar.bz2 nixpkgs-49410a7a6b068ae23f2247e3f9b24d47135d8ed0.tar.lz nixpkgs-49410a7a6b068ae23f2247e3f9b24d47135d8ed0.tar.xz nixpkgs-49410a7a6b068ae23f2247e3f9b24d47135d8ed0.tar.zst nixpkgs-49410a7a6b068ae23f2247e3f9b24d47135d8ed0.zip | |
goxel: 0.10.8 -> 0.12.0
| -rw-r--r-- | pkgs/applications/graphics/goxel/default.nix | 13 | ||||
| -rw-r--r-- | pkgs/applications/graphics/goxel/disable-imgui_ini.patch | 13 |
2 files changed, 2 insertions, 24 deletions
diff --git a/pkgs/applications/graphics/goxel/default.nix b/pkgs/applications/graphics/goxel/default.nix index 8236af42956..0c7d349d1d5 100644 --- a/pkgs/applications/graphics/goxel/default.nix +++ b/pkgs/applications/graphics/goxel/default.nix @@ -3,27 +3,18 @@ stdenv.mkDerivation rec { pname = "goxel"; - version = "0.10.8"; + version = "0.12.0"; src = fetchFromGitHub { owner = "guillaumechereau"; repo = "goxel"; rev = "v${version}"; - sha256 = "sha256-M9H9SV8xmU7Jw5rEdV0gfloIEBvWmWSuH+BCrowpf2M="; + hash = "sha256-taDe5xJU6ijikHaSMDYs/XE2O66X3J7jOKWzbj7hrN0="; }; - patches = [ ./disable-imgui_ini.patch ]; - nativeBuildInputs = [ scons pkg-config wrapGAppsHook ]; buildInputs = [ glfw3 gtk3 libpng12 ]; - env.NIX_CFLAGS_COMPILE = toString [ - # Needed with GCC 12 - "-Wno-error=format-truncation" - ]; - - NIX_LDFLAGS = "-lpthread"; - buildPhase = '' make release ''; diff --git a/pkgs/applications/graphics/goxel/disable-imgui_ini.patch b/pkgs/applications/graphics/goxel/disable-imgui_ini.patch deleted file mode 100644 index 9427d45487d..00000000000 --- a/pkgs/applications/graphics/goxel/disable-imgui_ini.patch +++ /dev/null @@ -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; |