diff options
| author | Niklas Hambüchen <mail@nh2.me> | 2019-12-15 04:02:41 +0100 |
|---|---|---|
| committer | Niklas Hambüchen <mail@nh2.me> | 2019-12-15 04:05:20 +0100 |
| commit | 97dc2e99f543a45918e55d2488869baef08b0179 (patch) | |
| tree | e7f0b2e8ff422c18d7e48658b9729900cdc59190 /pkgs/development/libraries/glog | |
| parent | 928bc00ec4ba8a4d42c9db64b85fd0145402fae8 (diff) | |
| download | nixpkgs-97dc2e99f543a45918e55d2488869baef08b0179.tar nixpkgs-97dc2e99f543a45918e55d2488869baef08b0179.tar.gz nixpkgs-97dc2e99f543a45918e55d2488869baef08b0179.tar.bz2 nixpkgs-97dc2e99f543a45918e55d2488869baef08b0179.tar.lz nixpkgs-97dc2e99f543a45918e55d2488869baef08b0179.tar.xz nixpkgs-97dc2e99f543a45918e55d2488869baef08b0179.tar.zst nixpkgs-97dc2e99f543a45918e55d2488869baef08b0179.zip | |
glog: Add upstream patch to fix tests with musl.
Originally found in https://github.com/nh2/static-haskell-nix/issues/70
Diffstat (limited to 'pkgs/development/libraries/glog')
| -rw-r--r-- | pkgs/development/libraries/glog/default.nix | 11 |
1 files changed, 10 insertions, 1 deletions
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 ]; |