Unverified Commit 9a423e2c authored by Artturi's avatar Artturi Committed by GitHub
Browse files

Merge pull request #248771 from trofi/libstrangle-gcc-13-fix 

libstrangle: pull gcc-13 fix pending upstream inclusion
parents 2600d091 c9791d9a

pkgs/tools/X11/libstrangle/default.nix

+9 −2
Original line number Diff line number Diff line 
{ lib, stdenv, fetchFromGitLab, libGL, libX11 }:

{ lib, stdenv, fetchFromGitLab, fetchpatch, libGL, libX11 }:



stdenv.mkDerivation rec {

  pname = "libstrangle";
@@ -17,6 +17,13 @@ stdenv.mkDerivation rec { 


  patches = [

    ./nixos.patch

    # Pull the fix pending upstream inclusion for gcc-13:

    #   https://gitlab.com/torkel104/libstrangle/-/merge_requests/29

    (fetchpatch {

      name = "gcc-13.patch";

      url = "https://gitlab.com/torkel104/libstrangle/-/commit/4e17025071de1d99630febe7270b4f63056d0dfa.patch";

      hash = "sha256-AKMHAZhCPcn62pi4fBGhw2r8SNSkCDMUCpR3IlmJ7wQ=";

    })

  ];



  postPatch = ''