From 3a7dca9950e62aab97c3d9a56dbf1ac3eee7522c Mon Sep 17 00:00:00 2001 From: Sirio Balmelli Date: Mon, 20 Apr 2020 15:27:28 +0200 Subject: [PATCH] mscgen: clean up build 1. Remove freetype dependency: - was not being used by build - trying to enable freetype gives nontrivial error 'gdoTextWidth: Problem doing text layout (GDFONTPATH=)' 2. Correctly link manpages by specifying 'outputs'. 3. Separate nativeBuildInputs from buildInputs Signed-off-by: Sirio Balmelli --- pkgs/tools/graphics/mscgen/default.nix | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/graphics/mscgen/default.nix b/pkgs/tools/graphics/mscgen/default.nix index a8aa9cffb98..f6bec5983c2 100644 --- a/pkgs/tools/graphics/mscgen/default.nix +++ b/pkgs/tools/graphics/mscgen/default.nix @@ -2,7 +2,6 @@ , bison , fetchurl , flex -, freetype , gd , libjpeg , libpng @@ -24,13 +23,16 @@ stdenv.mkDerivation { sha256 = "3c3481ae0599e1c2d30b7ed54ab45249127533ab2f20e768a0ae58d8551ddc23"; }; - buildInputs = [ bison flex freetype gd libjpeg libpng libwebp pkg-config zlib ]; + nativeBuildInputs = [ bison flex pkg-config ]; + buildInputs = [ gd libjpeg libpng libwebp zlib ]; doCheck = true; preCheck = '' sed -i -e "s|#!/bin/bash|#!${runtimeShell}|" test/renderercheck.sh ''; + outputs = [ "out" "man" ]; + meta = { homepage = "http://www.mcternan.me.uk/mscgen/"; description = "Convert Message Sequence Chart descriptions into PNG, SVG, or EPS images";