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

gtest: remove the "static" option

Browse Source 
pkgsStatic.gtest already has CMAKE_BUILD_SHARED set to OFF.
This commit is contained in:
Dmitry Kalinkin 2020-01-01 16:56:55 -05:00
parent 7e5b495851
commit 7e2c821e58
No known key found for this signature in database
GPG Key ID: 06AF1D3C38F04E0E
3 changed files with 3 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1,5 +1,4 @@
{ stdenv, cmake, ninja, fetchFromGitHub { stdenv, cmake, ninja, fetchFromGitHub }:
, static ? false }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "gtest"; pname = "gtest";
@ -20,7 +19,7 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [ cmake ninja ]; nativeBuildInputs = [ cmake ninja ];
cmakeFlags = stdenv.lib.optional (!static) "-DBUILD_SHARED_LIBS=ON"; cmakeFlags = [ "-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";

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

@ -10787,7 +10787,7 @@ in
arrayfire = callPackage ../development/libraries/arrayfire {}; arrayfire = callPackage ../development/libraries/arrayfire {};
arrow-cpp = callPackage ../development/libraries/arrow-cpp ({ arrow-cpp = callPackage ../development/libraries/arrow-cpp ({
gtest = gtest.override { static = true; }; inherit (pkgsStatic) gtest;
} // stdenv.lib.optionalAttrs (stdenv.hostPlatform.isi686 && stdenv.cc.isGNU) { } // stdenv.lib.optionalAttrs (stdenv.hostPlatform.isi686 && stdenv.cc.isGNU) {
stdenv = overrideCC stdenv buildPackages.gcc6; # hidden symbol `__divmoddi4' stdenv = overrideCC stdenv buildPackages.gcc6; # hidden symbol `__divmoddi4'
}); });

3
pkgs/top-level/static.nix
View File

@ -196,9 +196,6 @@ in {
glog = super.glog.override { glog = super.glog.override {
static = true; static = true;
}; };
gtest = super.gtest.override {
static = true;
};
cdo = super.cdo.override { cdo = super.cdo.override {
enable_all_static = true; enable_all_static = true;
}; };