Unverified Commit 8d4ac470 authored by Weijia Wang's avatar Weijia Wang Committed by GitHub
Browse files

Merge pull request #287078 from trofi/wxSVG-gcc-13-fix 

wxSVG: fix build failure against `gcc-13`
parents a278cc56 0d1390ec

pkgs/development/libraries/wxSVG/default.nix

+8 −0
Original line number Diff line number Diff line
@@ -23,6 +23,12 @@ stdenv.mkDerivation rec { 
    hash = "sha256-rkcykfjQpf6voGzScMgmxr6tS86yud1vzs8tt8JeJII=";

  };



  postPatch = ''

    # Apply upstream patch for gcc-13 support:

    #   https://sourceforge.net/p/wxsvg/git/ci/7b17fe365fb522618fb3520d7c5c1109b138358f/

    sed -i src/cairo/SVGCanvasCairo.cpp -e '1i #include <cstdint>'

  '';



  nativeBuildInputs = [

    pkg-config

  ];
@@ -36,6 +42,8 @@ stdenv.mkDerivation rec { 
    wxGTK

  ] ++ lib.optional stdenv.isDarwin Cocoa;



  enableParallelBuilding = true;



  meta = with lib; {

    homepage = "https://wxsvg.sourceforge.net/";

    description = "A SVG manipulation library built with wxWidgets";

pkgs/top-level/all-packages.nix

+0 −1
Original line number Diff line number Diff line
@@ -25502,7 +25502,6 @@ with pkgs; 














  wxSVG = callPackage ../development/libraries/wxSVG {















    wxGTK = wxGTK32;













    stdenv = gcc12Stdenv;















  };





























  wtk = callPackage ../development/libraries/wtk { };