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

Merge pull request #144561 from nh2/glog-0.5.0

Browse Source 
glog: 0.4.0 -> 0.5.0, also enable tests
This commit is contained in:
Niklas Hambüchen 2021-11-06 00:36:41 +01:00 committed by GitHub
commit b79047331e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 18 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
pkgs/development/libraries/glog/default.nix
View File

@ -2,43 +2,46 @@
stdenv.mkDerivation rec {
pname = "glog";
version = "0.4.0";
version = "0.5.0";
src = fetchFromGitHub {
owner = "google";
repo = "glog";
rev = "v${version}";
sha256 = "1xd3maiipfbxmhc9rrblc5x52nxvkwxp14npg31y5njqvkvzax9b";
sha256 = "17014q25c99qyis6l3fwxidw6222bb269fdlr74gn7pzmzg4lvg3";
};
patches = lib.optionals stdenv.hostPlatform.isMusl [
# TODO: Remove at next release that includes this commit.
patches = [
# Fix duplicate-concatenated nix store path in cmake file, see:
# https://github.com/NixOS/nixpkgs/pull/144561#issuecomment-960296043
# TODO: Remove when https://github.com/google/glog/pull/733 is merged and available.
(fetchpatch {
name = "glog-Fix-symbolize_unittest-for-musl-builds.patch";
url = "https://github.com/google/glog/commit/834dd780bf1fe0704b8ed0350ca355a55f711a9f.patch";
sha256 = "0k4lanxg85anyvjsj3mh93bcgds8gizpiamcy2zvs3yyfjl40awn";
name = "glog-cmake-Fix-incorrect-relative-path-concatenation.patch";
url = "https://github.com/google/glog/pull/733/commits/57c636c02784f909e4b5d3c2f0ecbdbb47097266.patch";
sha256 = "1py93gkzmcyi2ypcwyj3nri210z8fmlaif51yflzmrrv507zd7bi";
})
];
postPatch = lib.optionalString stdenv.isDarwin ''
# A path clash on case-insensitive file systems blocks creation of the build directory.
# The file in question is specific to bazel and does not influence the build result.
rm BUILD
'';
nativeBuildInputs = [ cmake ];
propagatedBuildInputs = [ gflags ];
cmakeFlags = [ "-DBUILD_SHARED_LIBS=ON" ];
cmakeFlags = [
"-DBUILD_SHARED_LIBS=ON"
# Mak CMake place RPATHs such that tests will find the built libraries.
# See https://github.com/NixOS/nixpkgs/pull/144561#discussion_r742468811 and https://github.com/NixOS/nixpkgs/pull/108496
"-DCMAKE_SKIP_BUILD_RPATH=OFF"
];
# TODO: Re-enable Darwin tests once we're on a release that has https://github.com/google/glog/issues/709#issuecomment-960381653 fixed
doCheck = !stdenv.isDarwin;
checkInputs = [ perl ];
doCheck = false; # fails with "Mangled symbols (28 out of 380) found in demangle.dm"
meta = with lib; {
homepage = "https://github.com/google/glog";
license = licenses.bsd3;
description = "Library for application-level logging";
platforms = platforms.unix;
maintainers = with lib.maintainers; [ nh2 r-burns ];
};
}