colin/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #77467 from veprbl/pr/thrift_darwin_fix

Browse Source 
thrift: fix checkPhase on darwin
This commit is contained in:
Dmitry Kalinkin 2020-01-10 16:14:11 -05:00 committed by GitHub
commit b74c26a17f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 13 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
pkgs/development/libraries/thrift/default.nix
View File

@ -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;