pyrox.dev / nixpkgs
lol
fork atom

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

libstrangle: pull gcc-13 fix pending upstream inclusion

authored by Artturi and committed by GitHub 9a423e2c 2600d091

+9 -2
unified split
+9 -2
pkgs/tools/X11/libstrangle/default.nix
··· 1 - { lib, stdenv, fetchFromGitLab, libGL, libX11 }: 2 3 stdenv.mkDerivation rec { 4 pname = "libstrangle"; ··· 16 makeFlags = [ "prefix=" "DESTDIR=$(out)" ]; 17 18 patches = [ 19 - ./nixos.patch 20 ]; 21 22 postPatch = ''
··· 1 + { lib, stdenv, fetchFromGitLab, fetchpatch, libGL, libX11 }: 2 3 stdenv.mkDerivation rec { 4 pname = "libstrangle"; ··· 16 makeFlags = [ "prefix=" "DESTDIR=$(out)" ]; 17 18 patches = [ 19 + ./nixos.patch 20 + # Pull the fix pending upstream inclusion for gcc-13: 21 + # https://gitlab.com/torkel104/libstrangle/-/merge_requests/29 22 + (fetchpatch { 23 + name = "gcc-13.patch"; 24 + url = "https://gitlab.com/torkel104/libstrangle/-/commit/4e17025071de1d99630febe7270b4f63056d0dfa.patch"; 25 + hash = "sha256-AKMHAZhCPcn62pi4fBGhw2r8SNSkCDMUCpR3IlmJ7wQ="; 26 + }) 27 ]; 28 29 postPatch = ''