From ec6bc32a3d706eeb26a6bf6ff7d85f873e21b36f Mon Sep 17 00:00:00 2001 From: Dmitry Kalinkin Date: Thu, 23 Apr 2020 16:08:12 -0400 Subject: [PATCH] uriparser: 0.9.1 -> 0.9.3 --- .../libraries/uriparser/default.nix | 19 +++++++++++++------ 1 file changed, 13 insertions(+), 6 deletions(-) diff --git a/pkgs/development/libraries/uriparser/default.nix b/pkgs/development/libraries/uriparser/default.nix index 971e053d4f6..884bc101260 100644 --- a/pkgs/development/libraries/uriparser/default.nix +++ b/pkgs/development/libraries/uriparser/default.nix @@ -1,19 +1,26 @@ -{ lib, stdenv, fetchurl, gtest, pkgconfig, doxygen, graphviz }: +{ lib, stdenv, fetchurl, fetchpatch, cmake, gtest, doxygen, graphviz }: stdenv.mkDerivation rec { pname = "uriparser"; - version = "0.9.1"; + version = "0.9.3"; # Release tarball differs from source tarball src = fetchurl { url = "https://github.com/uriparser/uriparser/releases/download/${pname}-${version}/${pname}-${version}.tar.bz2"; - sha256 = "1gisi7h8hd6mswbiaaa3s25bnb77xf37pzrmjy63rcdpwcyqy93m"; + sha256 = "13z234jdaqs9jj7i66gcv4q1rgsypjz6cighnlm1j4g80pdlmbr8"; }; - nativeBuildInputs = [ pkgconfig doxygen graphviz ]; - buildInputs = lib.optional doCheck gtest; - configureFlags = lib.optional (!doCheck) "--disable-tests"; + patches = [ + # fixes tests + (fetchpatch { + url = "https://github.com/uriparser/uriparser/commit/f870e6c68696a6018702caa5c8a2feba9b0f99fa.diff"; + sha256 = "1nd6bhys9hwy6ippa42vm95zhw6hldm1s4xbdzmdjswc96as1ff5"; + }) + ]; + nativeBuildInputs = [ cmake doxygen graphviz ]; + + checkInputs = [ gtest ]; doCheck = stdenv.targetPlatform.system == stdenv.hostPlatform.system; meta = with stdenv.lib; {