diff options
| author | Dmitry Kalinkin <dmitry.kalinkin@gmail.com> | 2018-12-26 17:43:38 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-12-26 17:43:38 -0500 |
| commit | 8e79ebc523d01aee24a29aaeff794e3a94830c74 (patch) | |
| tree | f703f83ac262a702a62de4659315fa2991541df6 | |
| parent | 626cc7eb21738b2409ca3928677542bc3e326fe2 (diff) | |
| parent | 956b4a87a8809170b07bcc5f6488cff1b1e8f540 (diff) | |
| download | nixlib-8e79ebc523d01aee24a29aaeff794e3a94830c74.tar nixlib-8e79ebc523d01aee24a29aaeff794e3a94830c74.tar.gz nixlib-8e79ebc523d01aee24a29aaeff794e3a94830c74.tar.bz2 nixlib-8e79ebc523d01aee24a29aaeff794e3a94830c74.tar.lz nixlib-8e79ebc523d01aee24a29aaeff794e3a94830c74.tar.xz nixlib-8e79ebc523d01aee24a29aaeff794e3a94830c74.tar.zst nixlib-8e79ebc523d01aee24a29aaeff794e3a94830c74.zip | |
Merge pull request #52934 from veprbl/pr/arrow_cpp_gtest_fix
arrow-cpp: fix build
| -rw-r--r-- | pkgs/development/libraries/arrow-cpp/default.nix | 4 | ||||
| -rw-r--r-- | pkgs/development/libraries/gtest/default.nix | 8 | ||||
| -rw-r--r-- | pkgs/top-level/all-packages.nix | 3 |
3 files changed, 8 insertions, 7 deletions
diff --git a/pkgs/development/libraries/arrow-cpp/default.nix b/pkgs/development/libraries/arrow-cpp/default.nix index 96259dc66948..f9d8736ea20a 100644 --- a/pkgs/development/libraries/arrow-cpp/default.nix +++ b/pkgs/development/libraries/arrow-cpp/default.nix @@ -1,4 +1,4 @@ -{ stdenv, symlinkJoin, fetchurl, fetchFromGitHub, boost, brotli, cmake, double-conversion, flatbuffers, gflags, glog, gtest, lz4, perl, python, rapidjson, snappy, thrift, which, zlib, zstd }: +{ stdenv, symlinkJoin, fetchurl, fetchFromGitHub, boost, brotli, cmake, double-conversion, flatbuffers, gflags, glog, gtest_static, lz4, perl, python, rapidjson, snappy, thrift, which, zlib, zstd }: let parquet-testing = fetchFromGitHub { @@ -49,7 +49,7 @@ stdenv.mkDerivation rec { FLATBUFFERS_HOME = flatbuffers; GFLAGS_HOME = gflags; GLOG_HOME = glog; - GTEST_HOME = gtest; + GTEST_HOME = symlinkJoin { name="gtest-wrap"; paths = [ gtest_static gtest_static.dev ]; }; LZ4_HOME = symlinkJoin { name="lz4-wrap"; paths = [ lz4 lz4.dev ]; }; RAPIDJSON_HOME = rapidjson; SNAPPY_HOME = symlinkJoin { name="snappy-wrap"; paths = [ snappy snappy.dev ]; }; diff --git a/pkgs/development/libraries/gtest/default.nix b/pkgs/development/libraries/gtest/default.nix index 65904ba215ad..9ceb571983e2 100644 --- a/pkgs/development/libraries/gtest/default.nix +++ b/pkgs/development/libraries/gtest/default.nix @@ -1,4 +1,6 @@ -{ stdenv, cmake, ninja, fetchFromGitHub }: +{ stdenv, cmake, ninja, fetchFromGitHub +, static ? false }: + stdenv.mkDerivation rec { name = "gtest-${version}"; version = "1.8.1"; @@ -18,9 +20,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake ninja ]; - cmakeFlags = [ - "-DBUILD_SHARED_LIBS=ON" - ]; + cmakeFlags = stdenv.lib.optional (!static) "-DBUILD_SHARED_LIBS=ON"; meta = with stdenv.lib; { description = "Google's framework for writing C++ tests"; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 88ea436477a0..df31f22eb9fa 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -3160,7 +3160,8 @@ in gt5 = callPackage ../tools/system/gt5 { }; - gtest = callPackage ../development/libraries/gtest {}; + gtest = callPackage ../development/libraries/gtest { }; + gtest_static = callPackage ../development/libraries/gtest { static = true; }; gmock = gtest; # TODO: move to aliases.nix gbenchmark = callPackage ../development/libraries/gbenchmark {}; |