diff options
author | Alyssa Ross <hi@alyssa.is> | 2023-02-14 09:53:03 +0000 |
---|---|---|
committer | Alyssa Ross <hi@alyssa.is> | 2023-02-14 09:53:03 +0000 |
commit | 200610b849c0aeb174a63e7526b7376aa8a339bf (patch) | |
tree | f57988f969df0344ef355473653daf0939a0d402 /pkgs/development/libraries/gtest/default.nix | |
parent | fa169bb239d7b2d860af851573569182ee5e0127 (diff) | |
parent | 46cc80cc78abdacca55f036a4f0341b96d660255 (diff) |
Merge remote-tracking branch 'origin/staging-next' into staging
Conflicts: pkgs/development/libraries/gtest/default.nix pkgs/development/libraries/hidapi/default.nix
Diffstat (limited to 'pkgs/development/libraries/gtest/default.nix')
-rw-r--r-- | pkgs/development/libraries/gtest/default.nix | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/pkgs/development/libraries/gtest/default.nix b/pkgs/development/libraries/gtest/default.nix index d4815c7aedc48..80013e3613d01 100644 --- a/pkgs/development/libraries/gtest/default.nix +++ b/pkgs/development/libraries/gtest/default.nix @@ -1,4 +1,10 @@ -{ lib, stdenv, cmake, ninja, fetchFromGitHub }: +{ lib +, stdenv +, fetchFromGitHub +, cmake +, ninja +, static ? stdenv.hostPlatform.isStatic, +}: stdenv.mkDerivation rec { pname = "gtest"; @@ -20,7 +26,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake ninja ]; cmakeFlags = [ - "-DBUILD_SHARED_LIBS=ON" + "-DBUILD_SHARED_LIBS=${if static then "OFF" else "ON"}" ] ++ lib.optionals ( (stdenv.cc.isGNU && (lib.versionOlder stdenv.cc.version "11.0")) || (stdenv.cc.isClang && (lib.versionOlder stdenv.cc.version "16.0")) |