From 05aff5f84265cc2640d5a9f3f9e635ed2eab71d2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Sun, 7 Mar 2021 02:14:38 +0100 Subject: [PATCH] biboumi: format, remove unused input --- pkgs/servers/xmpp/biboumi/default.nix | 23 ++++++++++++----------- 1 file changed, 12 insertions(+), 11 deletions(-) diff --git a/pkgs/servers/xmpp/biboumi/default.nix b/pkgs/servers/xmpp/biboumi/default.nix index 74d8d9ae520..50d2cfa964e 100644 --- a/pkgs/servers/xmpp/biboumi/default.nix +++ b/pkgs/servers/xmpp/biboumi/default.nix @@ -1,6 +1,13 @@ -{ lib, stdenv, fetchurl, fetchgit, cmake, libuuid, expat, sqlite, libidn, - libiconv, botan2, systemd, pkg-config, udns, coreutils, python3Packages } : +{ lib, stdenv, fetchurl, fetchgit, cmake, libuuid, expat, sqlite, libidn +, libiconv, botan2, systemd, pkg-config, udns, python3Packages } : +let + louiz_catch = fetchgit { + url = "https://lab.louiz.org/louiz/Catch.git"; + rev = "0a34cc201ef28bf25c88b0062f331369596cb7b7"; # v2.2.1 + sha256 = "0ad0sjhmzx61a763d2ali4vkj8aa1sbknnldks7xlf4gy83jfrbl"; + }; +in stdenv.mkDerivation rec { pname = "biboumi"; version = "9.0"; @@ -10,22 +17,16 @@ stdenv.mkDerivation rec { sha256 = "1jvygri165aknmvlinx3jb8cclny6cxdykjf8dp0a3l3228rmzqy"; }; - louiz_catch = fetchgit { - url = "https://lab.louiz.org/louiz/Catch.git"; - rev = "0a34cc201ef28bf25c88b0062f331369596cb7b7"; # v2.2.1 - sha256 = "0ad0sjhmzx61a763d2ali4vkj8aa1sbknnldks7xlf4gy83jfrbl"; - }; - patches = [ ./catch.patch ]; nativeBuildInputs = [ cmake pkg-config python3Packages.sphinx ]; - buildInputs = [ libuuid expat sqlite libiconv libidn botan2 systemd - udns ]; + buildInputs = [ libuuid expat sqlite libiconv libidn botan2 systemd udns ]; + buildFlags = [ "all" "man" ]; preConfigure = '' substituteInPlace CMakeLists.txt --replace /etc/biboumi $out/etc/biboumi - cp $louiz_catch/single_include/catch.hpp tests/ + cp ${louiz_catch}/single_include/catch.hpp tests/ ''; doCheck = true;