From ded8a2cd65e6e6f6262f2065e49cec57340cd6d5 Mon Sep 17 00:00:00 2001 From: sternenseemann Date: Thu, 14 May 2020 10:41:11 +0200 Subject: pkgs/sternenseemann/logbook: fix build for jingoo >= 1.3.0 --- pkgs/sternenseemann/logbook/default.nix | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) (limited to 'pkgs/sternenseemann') diff --git a/pkgs/sternenseemann/logbook/default.nix b/pkgs/sternenseemann/logbook/default.nix index d3d30028..456cab9f 100644 --- a/pkgs/sternenseemann/logbook/default.nix +++ b/pkgs/sternenseemann/logbook/default.nix @@ -1,4 +1,4 @@ -{ lib, buildDunePackage, fetchFromGitHub +{ lib, buildDunePackage, fetchFromGitHub, fetchpatch , ocaml_lwt, jingoo, ptime, angstrom, astring, cow}: buildDunePackage rec { @@ -15,6 +15,11 @@ buildDunePackage rec { buildInputs = [ cow ocaml_lwt jingoo ]; propagatedBuildInputs = [ ptime angstrom astring ]; + patches = lib.optionals (!lib.versionAtLeast "1.3.0" jingoo.version) [ (fetchpatch { + url = "https://github.com/sternenseemann/logbook/commit/d4ee40ada4bba55505cc55ab653e69fa5c6406e6.diff"; + sha256 = "0dj6q2h1pxcniypx14if4gnfq7bbghsig9g51n7z2mad0fsji4sa"; + }) ]; + useDune2 = true; meta = with lib; { -- cgit 1.4.1