diff options
| author | Alyssa Ross <hi@alyssa.is> | 2020-01-14 23:59:31 +0000 |
|---|---|---|
| committer | Alyssa Ross <hi@alyssa.is> | 2020-01-14 23:59:31 +0000 |
| commit | 388bd5ecef704d7aa423878e28cf46820ba42aaa (patch) | |
| tree | f56964e1b059a3400259b2a6c9274f0bd58e5648 /nixpkgs/pkgs/development/libraries/thrift/default.nix | |
| parent | a5e4eba0a2066e541c1e81938655cbf62067804e (diff) | |
| parent | 100012e55bc2a82fc680cba31a426ad38ead6fab (diff) | |
| download | nixlib-388bd5ecef704d7aa423878e28cf46820ba42aaa.tar nixlib-388bd5ecef704d7aa423878e28cf46820ba42aaa.tar.gz nixlib-388bd5ecef704d7aa423878e28cf46820ba42aaa.tar.bz2 nixlib-388bd5ecef704d7aa423878e28cf46820ba42aaa.tar.lz nixlib-388bd5ecef704d7aa423878e28cf46820ba42aaa.tar.xz nixlib-388bd5ecef704d7aa423878e28cf46820ba42aaa.tar.zst nixlib-388bd5ecef704d7aa423878e28cf46820ba42aaa.zip | |
Merge commit '100012e55bc2a82fc680cba31a426ad38ead6fab'
Diffstat (limited to 'nixpkgs/pkgs/development/libraries/thrift/default.nix')
| -rw-r--r-- | nixpkgs/pkgs/development/libraries/thrift/default.nix | 15 |
1 files changed, 13 insertions, 2 deletions
diff --git a/nixpkgs/pkgs/development/libraries/thrift/default.nix b/nixpkgs/pkgs/development/libraries/thrift/default.nix index b1b66ed052fb..1879cac96c18 100644 --- a/nixpkgs/pkgs/development/libraries/thrift/default.nix +++ b/nixpkgs/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; |