Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 41e06190bb3d
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: b74c26a17f18
Choose a head ref
  • 2 commits
  • 1 file changed
  • 1 contributor

Commits on Jan 10, 2020

  1. thrift: fix checkPhase on darwin

    @veprbl
    veprbl committed Jan 10, 2020
    Copy the full SHA
    ef1a865 View commit details

  2. Merge pull request #77467 from veprbl/pr/thrift_darwin_fix 

    thrift: fix checkPhase on darwin
    @veprbl
    veprbl authored Jan 10, 2020
    Copy the full SHA
    b74c26a View commit details
Showing with 13 additions and 2 deletions.
  1. +13 −2 pkgs/development/libraries/thrift/default.nix
15 changes: 13 additions & 2 deletions pkgs/development/libraries/thrift/default.nix
View file
Original file line number Diff line number Diff line change
@@ -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;