swiften: fix build

This commit is contained in:
Jan Tojnar 2022-01-08 15:10:27 +01:00
parent 37e9987fb9
commit ec90decc7d

View File

@ -1,4 +1,14 @@
{ lib, stdenv, python, expat, fetchurl, openssl, boost, sconsPackages }:
{ stdenv
, lib
, python
, expat
, fetchurl
, fetchpatch
, openssl
, boost
, sconsPackages
}:
stdenv.mkDerivation rec {
pname = "swiften";
version = "4.0.2";
@ -15,7 +25,18 @@ stdenv.mkDerivation rec {
sha256 = "0w0aiszjd58ynxpacwcgf052zpmbpcym4dhci64vbfgch6wryz0w";
};
patches = [ ./scons.patch ./build-fix.patch ];
patches = [
./scons.patch
./build-fix.patch
# Fix build with latest boost
# https://swift.im/git/swift/commit/Swiften/Base/Platform.h?id=3666cbbe30e4d4e25401a5902ae359bc2c24248b
(fetchpatch {
name = "3666cbbe30e4d4e25401a5902ae359bc2c24248b.patch";
url = "https://swift.im/git/swift/patch/Swiften/Base/Platform.h?id=3666cbbe30e4d4e25401a5902ae359bc2c24248b";
sha256 = "Wh8Nnfm0/EppSJ7aH2vTNObHtodE5tM19kV1oDfm70w=";
})
];
sconsFlags = [
"openssl=${openssl.dev}"