diff --git a/pkgs/by-name/sw/swiften/gcc14-fix.patch b/pkgs/by-name/sw/swiften/gcc14-fix.patch new file mode 100644 index 000000000000..8448a67d5115 --- /dev/null +++ b/pkgs/by-name/sw/swiften/gcc14-fix.patch @@ -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 + #include + #include ++#include + + #include + diff --git a/pkgs/by-name/sw/swiften/package.nix b/pkgs/by-name/sw/swiften/package.nix index 754ac1b8c79f..a79747c0d86e 100644 --- a/pkgs/by-name/sw/swiften/package.nix +++ b/pkgs/by-name/sw/swiften/package.nix @@ -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"