@@ -2,38 +2,44 @@
22
33stdenv.mkDerivation rec {
44 pname = "glog";
5− version = "0.4.0";
5+ version = "0.5.0";
66
77 src = fetchFromGitHub {
88 owner = "google";
99 repo = "glog";
1010 rev = "v${version}";
11− sha256 = "1xd3maiipfbxmhc9rrblc5x52nxvkwxp14npg31y5njqvkvzax9b";
11+ sha256 = "17014q25c99qyis6l3fwxidw6222bb269fdlr74gn7pzmzg4lvg3";
1212 };
1313
14− patches = lib.optionals stdenv.hostPlatform.isMusl [
15− # TODO: Remove at next release that includes this commit.
14+ patches = [
15+ # Fix duplicate-concatenated nix store path in cmake file, see:
16+ # https://github.com/NixOS/nixpkgs/pull/144561#issuecomment-960296043
17+ # TODO: Remove when https://github.com/google/glog/pull/733 is merged and available.
1618 (fetchpatch {
17− name = "glog-Fix-symbolize_unittest-for-musl-builds.patch";
18− url = "https://github.com/google/glog/commit/834dd780bf1fe0704b8ed0350ca355a55f711a9f.patch";
19− sha256 = "0k4lanxg85anyvjsj3mh93bcgds8gizpiamcy2zvs3yyfjl40awn";
19+ name = "glog-cmake-Fix-incorrect-relative-path-concatenation.patch";
20+ url = "https://github.com/google/glog/pull/733/commits/57c636c02784f909e4b5d3c2f0ecbdbb47097266.patch";
21+ sha256 = "1py93gkzmcyi2ypcwyj3nri210z8fmlaif51yflzmrrv507zd7bi";
2022 })
2123 ];
2224
23− postPatch = lib.optionalString stdenv.isDarwin ''
24− # A path clash on case-insensitive file systems blocks creation of the build directory.
25− # The file in question is specific to bazel and does not influence the build result.
26− rm BUILD
27− '';
28−
2925 nativeBuildInputs = [ cmake ];
3026
3127 propagatedBuildInputs = [ gflags ];
3228
3329 cmakeFlags = [ "-DBUILD_SHARED_LIBS=ON" ];
3430
31+ # TODO: Re-enable Darwin tests once we're on a release that has https://github.com/google/glog/issues/709#issuecomment-960381653 fixed
32+ doCheck = !stdenv.isDarwin;
3533 checkInputs = [ perl ];
36− doCheck = false; # fails with "Mangled symbols (28 out of 380) found in demangle.dm"
34+
35+ # Add `build/` directory (`$PWD`) to LD_LIBRARY_PATH so that the built library
36+ # can be loaded for the tests.
37+ # Adding to LD_LIBRARY_PATH correctly is nontrivial:
38+ # https://jdhao.github.io/2021/07/03/ld_library_path_empty_item/
39+ # https://unix.stackexchange.com/questions/162891/append-to-path-like-variable-without-creating-leading-colon-if-unset
40+ preCheck = ''
41+ export LD_LIBRARY_PATH=''${LD_LIBRARY_PATH:+''${LD_LIBRARY_PATH}:}''$PWD
42+ '';
3743
3844 meta = with lib; {
3945 homepage = "https://github.com/google/glog";