diff options
| author | Dmitry Kalinkin <dmitry.kalinkin@gmail.com> | 2020-01-01 16:56:55 -0500 |
|---|---|---|
| committer | Dmitry Kalinkin <dmitry.kalinkin@gmail.com> | 2020-01-03 11:41:19 -0500 |
| commit | 7e2c821e58b974427cf9e3538d7ed3ed4a3a0db5 (patch) | |
| tree | 573cefca85694eb39401446e7c292665607db824 | |
| parent | 7e5b4958519ad796a1a74b507e16f989b4eaa305 (diff) | |
| download | nixpkgs-7e2c821e58b974427cf9e3538d7ed3ed4a3a0db5.tar nixpkgs-7e2c821e58b974427cf9e3538d7ed3ed4a3a0db5.tar.gz nixpkgs-7e2c821e58b974427cf9e3538d7ed3ed4a3a0db5.tar.bz2 nixpkgs-7e2c821e58b974427cf9e3538d7ed3ed4a3a0db5.tar.lz nixpkgs-7e2c821e58b974427cf9e3538d7ed3ed4a3a0db5.tar.xz nixpkgs-7e2c821e58b974427cf9e3538d7ed3ed4a3a0db5.tar.zst nixpkgs-7e2c821e58b974427cf9e3538d7ed3ed4a3a0db5.zip | |
gtest: remove the "static" option
pkgsStatic.gtest already has CMAKE_BUILD_SHARED set to OFF.
| -rw-r--r-- | pkgs/development/libraries/gtest/default.nix | 5 | ||||
| -rw-r--r-- | pkgs/top-level/all-packages.nix | 2 | ||||
| -rw-r--r-- | pkgs/top-level/static.nix | 3 |
3 files changed, 3 insertions, 7 deletions
diff --git a/pkgs/development/libraries/gtest/default.nix b/pkgs/development/libraries/gtest/default.nix index 4326be59724..bbc582f581c 100644 --- a/pkgs/development/libraries/gtest/default.nix +++ b/pkgs/development/libraries/gtest/default.nix @@ -1,5 +1,4 @@ -{ stdenv, cmake, ninja, fetchFromGitHub -, static ? false }: +{ stdenv, cmake, ninja, fetchFromGitHub }: stdenv.mkDerivation rec { pname = "gtest"; @@ -20,7 +19,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake ninja ]; - cmakeFlags = stdenv.lib.optional (!static) "-DBUILD_SHARED_LIBS=ON"; + cmakeFlags = [ "-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 3c4bfa4d9cc..b58bd06f71a 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -10787,7 +10787,7 @@ in arrayfire = callPackage ../development/libraries/arrayfire {}; 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 = overrideCC stdenv buildPackages.gcc6; # hidden symbol `__divmoddi4' }); diff --git a/pkgs/top-level/static.nix b/pkgs/top-level/static.nix index ffb2d294437..aa31996b872 100644 --- a/pkgs/top-level/static.nix +++ b/pkgs/top-level/static.nix @@ -196,9 +196,6 @@ in { glog = super.glog.override { static = true; }; - gtest = super.gtest.override { - static = true; - }; cdo = super.cdo.override { enable_all_static = true; }; |