diff options
author | Tobias Mayer <tobim@fastmail.fm> | 2022-08-14 12:21:32 +0200 |
---|---|---|
committer | Tobias Mayer <tobim@fastmail.fm> | 2022-08-14 12:21:32 +0200 |
commit | d6ba407e5df87cc40d4ef92acf2a21759392dda3 (patch) | |
tree | 2682a653cddfef3e2e41f7d0a59300e51b3260e1 | |
parent | 0a8de67b93ff38ff8d538db83c31d08025c66bf2 (diff) | |
download | nixpkgs-d6ba407e5df87cc40d4ef92acf2a21759392dda3.tar nixpkgs-d6ba407e5df87cc40d4ef92acf2a21759392dda3.tar.gz nixpkgs-d6ba407e5df87cc40d4ef92acf2a21759392dda3.tar.bz2 nixpkgs-d6ba407e5df87cc40d4ef92acf2a21759392dda3.tar.lz nixpkgs-d6ba407e5df87cc40d4ef92acf2a21759392dda3.tar.xz nixpkgs-d6ba407e5df87cc40d4ef92acf2a21759392dda3.tar.zst nixpkgs-d6ba407e5df87cc40d4ef92acf2a21759392dda3.zip |
pkgs{Musl,Static}.glog: fix build
A few tests fail when built with musl or statically, so we now use gtest and turn those off.
-rw-r--r-- | pkgs/development/libraries/glog/default.nix | 15 |
1 files changed, 14 insertions, 1 deletions
diff --git a/pkgs/development/libraries/glog/default.nix b/pkgs/development/libraries/glog/default.nix index f49c8b98299..4e8503b4843 100644 --- a/pkgs/development/libraries/glog/default.nix +++ b/pkgs/development/libraries/glog/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, fetchFromGitHub, cmake, gflags, perl }: +{ stdenv, lib, fetchFromGitHub, cmake, gflags, gtest, perl }: stdenv.mkDerivation rec { pname = "glog"; @@ -13,6 +13,8 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake ]; + buildInputs = [ gtest ]; + propagatedBuildInputs = [ gflags ]; cmakeFlags = [ @@ -25,6 +27,17 @@ stdenv.mkDerivation rec { enableParallelChecking = false; checkInputs = [ perl ]; + GTEST_FILTER = + let + filteredTests = lib.optionals stdenv.hostPlatform.isMusl [ + "Symbolize.SymbolizeStackConsumption" + "Symbolize.SymbolizeWithDemanglingStackConsumption" + ] ++ lib.optionals stdenv.hostPlatform.isStatic [ + "LogBacktraceAt.DoesBacktraceAtRightLineWhenEnabled" + ]; + in + lib.optionalString doCheck "-${builtins.concatStringsSep ":" filteredTests}"; + meta = with lib; { homepage = "https://github.com/google/glog"; license = licenses.bsd3; |