dev/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions 2 Packages Projects Releases Wiki Activity

Merge pull request #52934 from veprbl/pr/arrow_cpp_gtest_fix

Browse Source 
arrow-cpp: fix build
This commit is contained in:
Dmitry Kalinkin 2018-12-26 17:43:38 -05:00 committed by GitHub
commit 8e79ebc523
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
pkgs/development/libraries/arrow-cpp/default.nix
View File

@ -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 let
parquet-testing = fetchFromGitHub { parquet-testing = fetchFromGitHub {
@ -49,7 +49,7 @@ stdenv.mkDerivation rec {
FLATBUFFERS_HOME = flatbuffers; FLATBUFFERS_HOME = flatbuffers;
GFLAGS_HOME = gflags; GFLAGS_HOME = gflags;
GLOG_HOME = glog; 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 ]; }; LZ4_HOME = symlinkJoin { name="lz4-wrap"; paths = [ lz4 lz4.dev ]; };
RAPIDJSON_HOME = rapidjson; RAPIDJSON_HOME = rapidjson;
SNAPPY_HOME = symlinkJoin { name="snappy-wrap"; paths = [ snappy snappy.dev ]; }; SNAPPY_HOME = symlinkJoin { name="snappy-wrap"; paths = [ snappy snappy.dev ]; };

8
pkgs/development/libraries/gtest/default.nix
View File

@ -1,4 +1,6 @@
{ stdenv, cmake, ninja, fetchFromGitHub }: { stdenv, cmake, ninja, fetchFromGitHub
, static ? false }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "gtest-${version}"; name = "gtest-${version}";
version = "1.8.1"; version = "1.8.1";
@ -18,9 +20,7 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [ cmake ninja ]; nativeBuildInputs = [ cmake ninja ];
cmakeFlags = [ cmakeFlags = stdenv.lib.optional (!static) "-DBUILD_SHARED_LIBS=ON";
"-DBUILD_SHARED_LIBS=ON"
];
meta = with stdenv.lib; { meta = with stdenv.lib; {
description = "Google's framework for writing C++ tests"; description = "Google's framework for writing C++ tests";

3
pkgs/top-level/all-packages.nix
View File

@ -3160,7 +3160,8 @@ in
gt5 = callPackage ../tools/system/gt5 { }; 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 gmock = gtest; # TODO: move to aliases.nix
gbenchmark = callPackage ../development/libraries/gbenchmark {}; gbenchmark = callPackage ../development/libraries/gbenchmark {};