From d7c6c9a79366fa1075d3442adbc212d44bff1e92 Mon Sep 17 00:00:00 2001 From: Doron Behar Date: Tue, 25 Feb 2020 10:36:57 +0200 Subject: [PATCH] cpp-utilities: patch upstream issue 18 (#80014) See https://github.com/Martchus/cpp-utilities/issues/18 --- .../libraries/cpp-utilities/default.nix | 18 +++++++++++++++++- 1 file changed, 17 insertions(+), 1 deletion(-) diff --git a/pkgs/development/libraries/cpp-utilities/default.nix b/pkgs/development/libraries/cpp-utilities/default.nix index c3cc9d84aa45..93ee2ddc7046 100644 --- a/pkgs/development/libraries/cpp-utilities/default.nix +++ b/pkgs/development/libraries/cpp-utilities/default.nix @@ -1,4 +1,9 @@ -{ stdenv, fetchFromGitHub, cmake, cppunit }: +{ stdenv +, fetchFromGitHub +, fetchpatch +, cmake +, cppunit +}: stdenv.mkDerivation rec { pname = "cpp-utilities"; @@ -10,6 +15,17 @@ stdenv.mkDerivation rec { rev = "v${version}"; sha256 = "0cghk1a0ki1063ci63imakmggwzkky1hx6lhrvc0wjfv754wsklb"; }; + # See https://github.com/Martchus/cpp-utilities/issues/18 + patches = [ + (fetchpatch { + url = "https://github.com/Martchus/cpp-utilities/commit/b2a2773cdfb2b0017a3fa3d0ed2259a9a5fda666.patch"; + sha256 = "01js90ba4xxljifncm48zbxmg7mwwz1gla1hn87yzbic47d85hfj"; + }) + (fetchpatch { + url = "https://github.com/Martchus/cpp-utilities/commit/4dd2179f191d1ace113f26177944684fa1561dc1.patch"; + sha256 = "0chw33mwsvj7cigd1c4xl2zhpbfsp5rrijdm46qpn78bq70xcz9j"; + }) + ]; nativeBuildInputs = [ cmake ]; checkInputs = [ cppunit ];