From 12e3dde80d2f86ffdcd8a3ae26f9b59b14747e78 Mon Sep 17 00:00:00 2001
From: Xiangyan Sun <wishstudio@gmail.com>
Date: Sat, 18 Apr 2026 11:35:05 -0700
Subject: [PATCH] zgv: fix build with gcc15; migrate to by-name

---
 .../zg}/zgv/add-include.patch                    |  0
 .../default.nix => by-name/zg/zgv/package.nix}   | 16 +++++++++++++---
 .../graphics => by-name/zg}/zgv/switch.patch     |  0
 pkgs/top-level/all-packages.nix                  |  8 --------
 4 files changed, 13 insertions(+), 11 deletions(-)
 rename pkgs/{applications/graphics => by-name/zg}/zgv/add-include.patch (100%)
 rename pkgs/{applications/graphics/zgv/default.nix => by-name/zg/zgv/package.nix} (79%)
 rename pkgs/{applications/graphics => by-name/zg}/zgv/switch.patch (100%)

diff --git a/pkgs/applications/graphics/zgv/add-include.patch b/pkgs/by-name/zg/zgv/add-include.patch
similarity index 100%
rename from pkgs/applications/graphics/zgv/add-include.patch
rename to pkgs/by-name/zg/zgv/add-include.patch
diff --git a/pkgs/applications/graphics/zgv/default.nix b/pkgs/by-name/zg/zgv/package.nix
similarity index 79%
rename from pkgs/applications/graphics/zgv/default.nix
rename to pkgs/by-name/zg/zgv/package.nix
index f0d662e0d4a7..bc55d389deb1 100644
--- a/pkgs/applications/graphics/zgv/default.nix
+++ b/pkgs/by-name/zg/zgv/package.nix
@@ -4,13 +4,20 @@
   fetchurl,
   fetchpatch,
   pkg-config,
-  SDL,
+  SDL_sixel,
   SDL_image,
   libjpeg,
   libpng,
   libtiff,
 }:
 
+let
+  # Enable terminal display. Note that it requires sixel graphics compatible
+  # terminals like mlterm or xterm -ti 340
+  SDL_image_sixel = SDL_image.override {
+    SDL = SDL_sixel;
+  };
+in
 stdenv.mkDerivation (finalAttrs: {
   pname = "zgv";
   version = "5.9";
@@ -21,8 +28,8 @@ stdenv.mkDerivation (finalAttrs: {
 
   nativeBuildInputs = [ pkg-config ];
   buildInputs = [
-    SDL
-    SDL_image
+    SDL_sixel
+    SDL_image_sixel
     libjpeg
     libpng
     libtiff
@@ -30,6 +37,9 @@ stdenv.mkDerivation (finalAttrs: {
 
   hardeningDisable = [ "format" ];
 
+  # gcc15
+  env.NIX_CFLAGS_COMPILE = "-std=gnu17";
+
   makeFlags = [
     "BACKEND=SDL"
   ];
diff --git a/pkgs/applications/graphics/zgv/switch.patch b/pkgs/by-name/zg/zgv/switch.patch
similarity index 100%
rename from pkgs/applications/graphics/zgv/switch.patch
rename to pkgs/by-name/zg/zgv/switch.patch
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 0c6306892b86..4d1c9996c9a5 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -11026,14 +11026,6 @@ with pkgs;
 
   zed-editor-fhs = zed-editor.fhs;
 
-  zgv = callPackage ../applications/graphics/zgv {
-    # Enable the below line for terminal display. Note
-    # that it requires sixel graphics compatible terminals like mlterm
-    # or xterm -ti 340
-    SDL = SDL_sixel;
-    SDL_image = SDL_image.override { SDL = SDL_sixel; };
-  };
-
   zynaddsubfx-fltk = zynaddsubfx.override {
     guiModule = "fltk";
   };