glog: 0.5.0 -> 0.6.0
This commit is contained in:
parent
a93c334ff0
commit
f70bf64e75
|
@ -1,27 +1,16 @@
|
||||||
{ stdenv, lib, fetchFromGitHub, fetchpatch, cmake, gflags, perl }:
|
{ stdenv, lib, fetchFromGitHub, cmake, gflags, perl }:
|
||||||
|
|
||||||
stdenv.mkDerivation rec {
|
stdenv.mkDerivation rec {
|
||||||
pname = "glog";
|
pname = "glog";
|
||||||
version = "0.5.0";
|
version = "0.6.0";
|
||||||
|
|
||||||
src = fetchFromGitHub {
|
src = fetchFromGitHub {
|
||||||
owner = "google";
|
owner = "google";
|
||||||
repo = "glog";
|
repo = "glog";
|
||||||
rev = "v${version}";
|
rev = "v${version}";
|
||||||
sha256 = "17014q25c99qyis6l3fwxidw6222bb269fdlr74gn7pzmzg4lvg3";
|
sha256 = "sha256-xqRp9vaauBkKz2CXbh/Z4TWqhaUtqfbsSlbYZR/kW9s=";
|
||||||
};
|
};
|
||||||
|
|
||||||
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-cmake-Fix-incorrect-relative-path-concatenation.patch";
|
|
||||||
url = "https://github.com/google/glog/pull/733/commits/57c636c02784f909e4b5d3c2f0ecbdbb47097266.patch";
|
|
||||||
sha256 = "1py93gkzmcyi2ypcwyj3nri210z8fmlaif51yflzmrrv507zd7bi";
|
|
||||||
})
|
|
||||||
];
|
|
||||||
|
|
||||||
nativeBuildInputs = [ cmake ];
|
nativeBuildInputs = [ cmake ];
|
||||||
|
|
||||||
propagatedBuildInputs = [ gflags ];
|
propagatedBuildInputs = [ gflags ];
|
||||||
|
|
Loading…
Reference in a new issue