From f70bf64e75bfb273f7e56d2c0f694d0283006f1c Mon Sep 17 00:00:00 2001 From: Artturin Date: Sat, 9 Apr 2022 02:30:19 +0300 Subject: [PATCH] glog: 0.5.0 -> 0.6.0 --- pkgs/development/libraries/glog/default.nix | 17 +++-------------- 1 file changed, 3 insertions(+), 14 deletions(-) diff --git a/pkgs/development/libraries/glog/default.nix b/pkgs/development/libraries/glog/default.nix index f66374f65a3..98ae294c480 100644 --- a/pkgs/development/libraries/glog/default.nix +++ b/pkgs/development/libraries/glog/default.nix @@ -1,27 +1,16 @@ -{ stdenv, lib, fetchFromGitHub, fetchpatch, cmake, gflags, perl }: +{ stdenv, lib, fetchFromGitHub, cmake, gflags, perl }: stdenv.mkDerivation rec { pname = "glog"; - version = "0.5.0"; + version = "0.6.0"; src = fetchFromGitHub { owner = "google"; repo = "glog"; 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 ]; propagatedBuildInputs = [ gflags ];