From ef1a86592bc00e92ac783791eadfcde1632e3fe8 Mon Sep 17 00:00:00 2001 From: Dmitry Kalinkin Date: Fri, 10 Jan 2020 15:19:01 -0500 Subject: thrift: fix checkPhase on darwin --- pkgs/development/libraries/thrift/default.nix | 15 +++++++++++++-- 1 file changed, 13 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/thrift/default.nix b/pkgs/development/libraries/thrift/default.nix index b1b66ed052fb..1879cac96c18 100644 --- a/pkgs/development/libraries/thrift/default.nix +++ b/pkgs/development/libraries/thrift/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, boost, zlib, libevent, openssl, python, cmake, pkgconfig +{ stdenv, fetchurl, fetchpatch, boost, zlib, libevent, openssl, python, cmake, pkgconfig , bison, flex, twisted, static ? false }: stdenv.mkDerivation rec { @@ -10,6 +10,15 @@ stdenv.mkDerivation rec { sha256 = "0yai9c3bdsrkkjshgim7zk0i7malwfprg00l9774dbrkh2w4ilvs"; }; + patches = [ + # Fix a failing test on darwin + # https://issues.apache.org/jira/browse/THRIFT-4976 + (fetchpatch { + url = "https://github.com/apache/thrift/commit/6701dbb8e89f6550c7843e9b75b118998df471c3.diff"; + sha256 = "14rqma2b2zv3zxkkl5iv9kvyp3zihvad6fdc2gcdqv37nqnswx9d"; + }) + ]; + # Workaround to make the python wrapper not drop this package: # pythonFull.buildEnv.override { extraLibs = [ thrift ]; } pythonPath = []; @@ -32,7 +41,9 @@ stdenv.mkDerivation rec { doCheck = !static; checkPhase = '' runHook preCheck - LD_LIBRARY_PATH=$LD_LIBRARY_PATH:$PWD/lib ctest -E PythonTestSSLSocket + + ${stdenv.lib.optionalString stdenv.isDarwin "DY"}LD_LIBRARY_PATH=$PWD/lib ctest -E PythonTestSSLSocket + runHook postCheck ''; enableParallelChecking = false; -- cgit 1.4.1