From 97dc2e99f543a45918e55d2488869baef08b0179 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Niklas=20Hamb=C3=BCchen?= Date: Sun, 15 Dec 2019 04:02:41 +0100 Subject: [PATCH] glog: Add upstream patch to fix tests with musl. Originally found in https://github.com/nh2/static-haskell-nix/issues/70 --- pkgs/development/libraries/glog/default.nix | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/pkgs/development/libraries/glog/default.nix b/pkgs/development/libraries/glog/default.nix index 6aa300e2b62..792217043da 100644 --- a/pkgs/development/libraries/glog/default.nix +++ b/pkgs/development/libraries/glog/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, autoreconfHook, perl }: +{ stdenv, lib, fetchFromGitHub, fetchpatch, autoreconfHook, perl }: stdenv.mkDerivation rec { pname = "glog"; @@ -11,6 +11,15 @@ stdenv.mkDerivation rec { sha256 = "1xd3maiipfbxmhc9rrblc5x52nxvkwxp14npg31y5njqvkvzax9b"; }; + patches = lib.optionals stdenv.hostPlatform.isMusl [ + # TODO: Remove at next release that includes this commit. + (fetchpatch { + name = "glog-Fix-symbolize_unittest-for-musl-builds.patch"; + url = "https://github.com/google/glog/commit/834dd780bf1fe0704b8ed0350ca355a55f711a9f.patch"; + sha256 = "0k4lanxg85anyvjsj3mh93bcgds8gizpiamcy2zvs3yyfjl40awn"; + }) + ]; + nativeBuildInputs = [ autoreconfHook ]; checkInputs = [ perl ];