From 62b54d589303dca091de32a280479b3142c756f7 Mon Sep 17 00:00:00 2001
From: Matthew Bauer <mjbauer95@gmail.com>
Date: Sun, 30 Dec 2018 14:05:24 -0600
Subject: [PATCH] =?UTF-8?q?arrow-cpp:=20don=E2=80=99t=20expose=20gtest=5Fs?=
=?UTF-8?q?tatic?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
pkgs/development/libraries/arrow-cpp/default.nix | 4 ++--
pkgs/top-level/all-packages.nix | 5 +++--
2 files changed, 5 insertions(+), 4 deletions(-)
diff --git a/pkgs/development/libraries/arrow-cpp/default.nix b/pkgs/development/libraries/arrow-cpp/default.nix
index f9d8736ea20a..811dfc47194a 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_static, lz4, perl, python, rapidjson, snappy, thrift, which, zlib, zstd }:
+{ stdenv, symlinkJoin, fetchurl, fetchFromGitHub, boost, brotli, cmake, double-conversion, flatbuffers, gflags, glog, gtest, 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 = symlinkJoin { name="gtest-wrap"; paths = [ gtest_static gtest_static.dev ]; };
+ GTEST_HOME = symlinkJoin { name="gtest-wrap"; paths = [ gtest gtest.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/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index e8f8cb564bd9..9423c3fa2331 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -3161,7 +3161,6 @@ in
gt5 = callPackage ../tools/system/gt5 { };
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 {};
@@ -9308,7 +9307,9 @@ in
armadillo = callPackage ../development/libraries/armadillo {};
- arrow-cpp = callPackage ../development/libraries/arrow-cpp {};
+ arrow-cpp = callPackage ../development/libraries/arrow-cpp {
+ gtest = gtest.override { static = true; };
+ };
assimp = callPackage ../development/libraries/assimp { };