diff options
| author | Alyssa Ross <hi@alyssa.is> | 2020-05-12 14:45:39 +0000 |
|---|---|---|
| committer | Alyssa Ross <hi@alyssa.is> | 2020-05-12 14:56:01 +0000 |
| commit | eb7dadee9c0f903f1152f8dd4165453bfa48ccf4 (patch) | |
| tree | a6bd66dcbec895aae167465672af08a1ca70f089 /nixpkgs/pkgs/development/libraries/uriparser | |
| parent | 3879b925f5dae3a0eb5c98b10c1ac5a0e4d729a3 (diff) | |
| parent | 683c68232e91f76386db979c461d8fbe2a018782 (diff) | |
| download | nixlib-eb7dadee9c0f903f1152f8dd4165453bfa48ccf4.tar nixlib-eb7dadee9c0f903f1152f8dd4165453bfa48ccf4.tar.gz nixlib-eb7dadee9c0f903f1152f8dd4165453bfa48ccf4.tar.bz2 nixlib-eb7dadee9c0f903f1152f8dd4165453bfa48ccf4.tar.lz nixlib-eb7dadee9c0f903f1152f8dd4165453bfa48ccf4.tar.xz nixlib-eb7dadee9c0f903f1152f8dd4165453bfa48ccf4.tar.zst nixlib-eb7dadee9c0f903f1152f8dd4165453bfa48ccf4.zip | |
Merge commit '683c68232e91f76386db979c461d8fbe2a018782'
Diffstat (limited to 'nixpkgs/pkgs/development/libraries/uriparser')
| -rw-r--r-- | nixpkgs/pkgs/development/libraries/uriparser/default.nix | 23 |
1 files changed, 17 insertions, 6 deletions
diff --git a/nixpkgs/pkgs/development/libraries/uriparser/default.nix b/nixpkgs/pkgs/development/libraries/uriparser/default.nix index 971e053d4f65..de621b30e247 100644 --- a/nixpkgs/pkgs/development/libraries/uriparser/default.nix +++ b/nixpkgs/pkgs/development/libraries/uriparser/default.nix @@ -1,19 +1,30 @@ -{ lib, stdenv, fetchurl, gtest, pkgconfig, doxygen, graphviz }: +{ lib, stdenv, fetchurl, fetchpatch, cmake, gtest }: 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 ]; + + cmakeFlags = [ + "-DURIPARSER_BUILD_DOCS=OFF" + ]; + + checkInputs = [ gtest ]; doCheck = stdenv.targetPlatform.system == stdenv.hostPlatform.system; meta = with stdenv.lib; { |