Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

glog: 0.6.0 -> 0.7.1 #289608

Closed
wants to merge 3 commits into from
Closed

glog: 0.6.0 -> 0.7.1 #289608

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
8f4ecc0
glog: 0.6.0 -> 0.7.1
r-ryantm Jun 13, 2024
bd59d35
glog: Enable pkg-config files
nh2 Jun 23, 2024
98961be
folly: Fix build with glog >= 0.7.0
nh2 Jun 23, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 16 additions & 0 deletions pkgs/development/libraries/folly/default.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@
, stdenv
, overrideSDK
, fetchFromGitHub
, fetchpatch
, boost
, cmake
, double-conversion
Expand Down Expand Up @@ -36,6 +37,21 @@ stdenv.mkDerivation rec {
sha256 = "sha256-INvWTw27fmVbKQIT9ebdRGMCOIzpc/NepRN2EnKLJx0=";
};

patches = [
# Fix incorrect include of glog >= 0.7.0, see https://github.com/facebook/folly/issues/2171
(fetchpatch {
name = "folly-fix-cmake-find-glog.patch";
url = "https://aur.archlinux.org/cgit/aur.git/plain/fix-cmake-find-glog.patch?h=folly&id=4b68f47338d4b20111e3ffa1291433120bb899f0";
hash = "sha256-QGNpS5UNEm+0PW9+agwUVILzpK9t020KXDGyP03OAwE=";
})
# Fix missing includes with glog >= 0.7.0, see https://github.com/facebook/folly/pull/2245
(fetchpatch {
name = "folly-symbolizer-Fix-missing-unistd-h-include.patch";
url = "https://github.com/facebook/folly/commit/f64cfb8aca569c1259c1e202861281b4704565c6.patch";
hash = "sha256-j1uV0JDFsMReCG7XVVADwW1f/2PICYzqdyfEjP314Dg=";
})
];

nativeBuildInputs = [
cmake
pkg-config
Expand Down
10 changes: 8 additions & 2 deletions pkgs/development/libraries/glog/default.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,13 +2,13 @@

stdenv.mkDerivation rec {
pname = "glog";
version = "0.6.0";
version = "0.7.1";

src = fetchFromGitHub {
owner = "google";
repo = "glog";
rev = "v${version}";
sha256 = "sha256-xqRp9vaauBkKz2CXbh/Z4TWqhaUtqfbsSlbYZR/kW9s=";
sha256 = "sha256-+nwWP6VBmhgU7GCPSEGUzvUSCc48wXME181WpJ5ABP4=";
};

nativeBuildInputs = [ cmake ];
Expand All @@ -24,6 +24,12 @@ stdenv.mkDerivation rec {
# consumers of the CMake config file to fail at the configuration step.
# Explicitly disabling unwind support sidesteps the issue.
"-DWITH_UNWIND=OFF"
# Upstream disabled generation of pkg-config `.pc` files since
# https://github.com/google/glog/releases/tag/v0.7.0
# because they are "undocumented and untested".
# Non-C++ dependents (that thus can't use CMake) may need them though
# to find `glog`, so we enable them.
"-DWITH_PKGCONFIG=ON"
];

doCheck = true;
Expand Down