Merge #276461: libtins: pull upstream fix for gcc-13

...into staging-next
This commit is contained in:
Vladimír Čunát
2023-12-31 15:17:21 +01:00
+12 -1
View File
@@ -1,4 +1,4 @@
{ boost, cmake, fetchFromGitHub, gtest, libpcap, openssl, lib, stdenv }:
{ boost, cmake, fetchFromGitHub, fetchpatch, gtest, libpcap, openssl, lib, stdenv }:
stdenv.mkDerivation rec {
pname = "libtins";
@@ -11,6 +11,17 @@ stdenv.mkDerivation rec {
sha256 = "sha256-mXbinXh/CO0SZZ71+K+FozbHCCoi12+AIa2o+P0QmUw=";
};
patches = [
# Pull gcc-13 fixes:
# https://github.com/mfontanini/libtins/pull/496
# TODO: remove when upgrade to the next version.
(fetchpatch {
name = "gcc-13.patch";
url = "https://github.com/mfontanini/libtins/commit/812be7966d445ec56e88eab512f8fd2d57152427.patch";
hash = "sha256-5RCFPe95r1CBrAocjTPR2SvUlgaGa1aBc8RazyxUj3M=";
})
];
postPatch = ''
rm -rf googletest
cp -r ${gtest.src} googletest