about summary refs log tree commit diff
diff options
context:
space:
mode:
authorSirio Balmelli <sirio@b-ad.ch>2020-04-20 15:27:28 +0200
committerSirio Balmelli <sirio@b-ad.ch>2020-04-20 15:27:28 +0200
commit3a7dca9950e62aab97c3d9a56dbf1ac3eee7522c (patch)
tree02e6608507241f9736d9781d50beb74f36e53d95
parent410fc69c7c6954084f0d11c82fb2208d9fe33c78 (diff)
downloadnixlib-3a7dca9950e62aab97c3d9a56dbf1ac3eee7522c.tar
nixlib-3a7dca9950e62aab97c3d9a56dbf1ac3eee7522c.tar.gz
nixlib-3a7dca9950e62aab97c3d9a56dbf1ac3eee7522c.tar.bz2
nixlib-3a7dca9950e62aab97c3d9a56dbf1ac3eee7522c.tar.lz
nixlib-3a7dca9950e62aab97c3d9a56dbf1ac3eee7522c.tar.xz
nixlib-3a7dca9950e62aab97c3d9a56dbf1ac3eee7522c.tar.zst
nixlib-3a7dca9950e62aab97c3d9a56dbf1ac3eee7522c.zip
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 <sirio@b-ad.ch>
-rw-r--r--pkgs/tools/graphics/mscgen/default.nix6
1 files changed, 4 insertions, 2 deletions
diff --git a/pkgs/tools/graphics/mscgen/default.nix b/pkgs/tools/graphics/mscgen/default.nix
index a8aa9cffb983..f6bec5983c2a 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";