Unverified Commit b092d651 authored by Peder Bergebakken Sundt's avatar Peder Bergebakken Sundt Committed by GitHub
Browse files

zgv: fix build with gcc15; migrate to by-name (#511204)

parents e993c7c0 12e3dde8

pkgs/applications/graphics/zgv/default.nix→pkgs/by-name/zg/zgv/package.nix

+13 −3
Original line number Diff line number Diff line
@@ -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"

  ];

pkgs/top-level/all-packages.nix

+0 −8
Original line number Diff line number Diff line
@@ -10886,14 +10886,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";

  };