public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

mscgen: clean up build

Browse Source 
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 <sirio@b-ad.ch>
This commit is contained in:
Sirio Balmelli 2020-04-20 15:27:28 +02:00
parent 410fc69c7c
commit 3a7dca9950
No known key found for this signature in database
GPG Key ID: 0437A96EFE4C426E
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
pkgs/tools/graphics/mscgen/default.nix
View File

@ -2,7 +2,6 @@
, bison , bison
, fetchurl , fetchurl
, flex , flex
, freetype
, gd , gd
, libjpeg , libjpeg
, libpng , libpng
@ -24,13 +23,16 @@ stdenv.mkDerivation {
sha256 = "3c3481ae0599e1c2d30b7ed54ab45249127533ab2f20e768a0ae58d8551ddc23"; 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; doCheck = true;
preCheck = '' preCheck = ''
sed -i -e "s|#!/bin/bash|#!${runtimeShell}|" test/renderercheck.sh sed -i -e "s|#!/bin/bash|#!${runtimeShell}|" test/renderercheck.sh
''; '';
outputs = [ "out" "man" ];
meta = { meta = {
homepage = "http://www.mcternan.me.uk/mscgen/"; homepage = "http://www.mcternan.me.uk/mscgen/";
description = "Convert Message Sequence Chart descriptions into PNG, SVG, or EPS images"; description = "Convert Message Sequence Chart descriptions into PNG, SVG, or EPS images";