swiften: fix GCC 14 build

This commit is contained in:
FliegendeWurst
2025-01-13 16:15:40 +01:00
parent d9e9853753
commit 41ab0f7acc
2 changed files with 19 additions and 4 deletions
+12
View File
@@ -0,0 +1,12 @@
diff --git a/Swift/Controllers/StatusCache.h b/Swift/Controllers/StatusCache.h
index 83fd17a..a7ca765 100644
--- a/Swift/Controllers/StatusCache.h
+++ b/Swift/Controllers/StatusCache.h
@@ -9,6 +9,7 @@
#include <list>
#include <string>
#include <utility>
+#include <vector>
#include <boost/filesystem/path.hpp>
+7 -4
View File
@@ -9,7 +9,8 @@
fetchurl,
fetchpatch,
openssl,
boost,
# pin Boost 1.86 due to use of boost/asio/io_service.hpp
boost186,
scons,
}:
@@ -33,6 +34,8 @@ stdenv.mkDerivation rec {
url = "https://swift.im/git/swift/patch/Swiften/Base/Platform.h?id=3666cbbe30e4d4e25401a5902ae359bc2c24248b";
sha256 = "Wh8Nnfm0/EppSJ7aH2vTNObHtodE5tM19kV1oDfm70w=";
})
./gcc14-fix.patch
];
nativeBuildInputs = [
@@ -49,13 +52,13 @@ stdenv.mkDerivation rec {
propagatedBuildInputs = [
openssl
boost
boost186
];
sconsFlags = [
"openssl=${openssl.dev}"
"boost_includedir=${boost.dev}/include"
"boost_libdir=${boost.out}/lib"
"boost_includedir=${lib.getDev boost186}/include"
"boost_libdir=${boost186.out}/lib"
"boost_bundled_enable=false"
"max_jobs=1"
"optimize=1"