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

Merge pull request #53090 from matthewbauer/dont-expose-static-libs

Browse Source 
arrow-cpp: don’t expose gtest_static
This commit is contained in:
Matthew Bauer 2018-12-30 19:50:38 -06:00 committed by GitHub
commit 77c88b2585
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 5 additions and 4 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_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 ]; };

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

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