diff options
| -rw-r--r-- | pkgs/development/libraries/swiften/default.nix | 5 | ||||
| -rw-r--r-- | pkgs/development/libraries/swiften/scons.patch | 9 |
2 files changed, 13 insertions, 1 deletions
diff --git a/pkgs/development/libraries/swiften/default.nix b/pkgs/development/libraries/swiften/default.nix index 5221ef9418f..e30da732a46 100644 --- a/pkgs/development/libraries/swiften/default.nix +++ b/pkgs/development/libraries/swiften/default.nix @@ -12,6 +12,8 @@ stdenv.mkDerivation rec { sha256 = "0w0aiszjd58ynxpacwcgf052zpmbpcym4dhci64vbfgch6wryz0w"; }; + patches = [ ./scons.patch ]; + sconsFlags = [ "openssl=${openssl.dev}" "boost_includedir=${boost.dev}/include" @@ -23,12 +25,13 @@ stdenv.mkDerivation rec { installFlags+=" SWIFT_INSTALLDIR=$out" ''; + enableParallelBuilding = true; + meta = with stdenv.lib; { description = "An XMPP library for C++, used by the Swift client"; homepage = http://swift.im/swiften.html; license = licenses.gpl2Plus; platforms = platforms.linux; maintainers = [ maintainers.twey ]; - broken = true; # TODO: Build is failing! }; } diff --git a/pkgs/development/libraries/swiften/scons.patch b/pkgs/development/libraries/swiften/scons.patch new file mode 100644 index 00000000000..d956767696d --- /dev/null +++ b/pkgs/development/libraries/swiften/scons.patch @@ -0,0 +1,9 @@ +--- a/BuildTools/SCons/SConscript.boot ++++ b/BuildTools/SCons/SConscript.boot +@@ -129,5 +129 @@ vars.Add(PathVariable("sparkle_public_dsa_key", "Optional path to a public DSA k +-env_ENV = { +- 'PATH' : os.environ['PATH'], +- 'LD_LIBRARY_PATH' : os.environ.get("LD_LIBRARY_PATH", ""), +- 'TERM' : os.environ.get("TERM", ""), +-} ++env_ENV = os.environ |