@@ -1,6 +1,13 @@
1−{ lib, stdenv, fetchurl, fetchgit, cmake, libuuid, expat, sqlite, libidn,
2− libiconv, botan2, systemd, pkg-config, udns, coreutils, python3Packages } :
1+{ lib, stdenv, fetchurl, fetchgit, cmake, libuuid, expat, sqlite, libidn
2+, libiconv, botan2, systemd, pkg-config, udns, python3Packages } :
33
4+let
5+ louiz_catch = fetchgit {
6+ url = "https://lab.louiz.org/louiz/Catch.git";
7+ rev = "0a34cc201ef28bf25c88b0062f331369596cb7b7"; # v2.2.1
8+ sha256 = "0ad0sjhmzx61a763d2ali4vkj8aa1sbknnldks7xlf4gy83jfrbl";
9+ };
10+in
411stdenv.mkDerivation rec {
512 pname = "biboumi";
613 version = "9.0";
@@ -10,22 +17,16 @@ stdenv.mkDerivation rec {
1017 sha256 = "1jvygri165aknmvlinx3jb8cclny6cxdykjf8dp0a3l3228rmzqy";
1118 };
1219
13− louiz_catch = fetchgit {
14− url = "https://lab.louiz.org/louiz/Catch.git";
15− rev = "0a34cc201ef28bf25c88b0062f331369596cb7b7"; # v2.2.1
16− sha256 = "0ad0sjhmzx61a763d2ali4vkj8aa1sbknnldks7xlf4gy83jfrbl";
17− };
18−
1920 patches = [ ./catch.patch ];
2021
2122 nativeBuildInputs = [ cmake pkg-config python3Packages.sphinx ];
22− buildInputs = [ libuuid expat sqlite libiconv libidn botan2 systemd
23− udns ];
23+ buildInputs = [ libuuid expat sqlite libiconv libidn botan2 systemd udns ];
24+
2425 buildFlags = [ "all" "man" ];
2526
2627 preConfigure = ''
2728 substituteInPlace CMakeLists.txt --replace /etc/biboumi $out/etc/biboumi
28− cp $louiz_catch/single_include/catch.hpp tests/
29+ cp ${louiz_catch}/single_include/catch.hpp tests/
2930 '';
3031
3132 doCheck = true;