Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: e9e9582986e6
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 59242df8d64b
Choose a head ref
  • 3 commits
  • 1 file changed
  • 2 contributors

Commits on Apr 19, 2020

  1. mscgen: add pkg-config build-time dependency 

    Signed-off-by: Sirio Balmelli <sirio@b-ad.ch>
    @siriobalmelli
    siriobalmelli committed Apr 19, 2020
    Copy the full SHA
    410fc69 View commit details

Commits on Apr 20, 2020

  1. 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>
    @siriobalmelli
    siriobalmelli committed Apr 20, 2020
    Copy the full SHA
    3a7dca9 View commit details

  2. Merge pull request #85580 from siriobalmelli-foss/fix/mscgen 

    mscgen: fix build
    @Mic92
    Mic92 authored Apr 20, 2020
    Copy the full SHA
    59242df View commit details
Showing with 16 additions and 2 deletions.
  1. +16 −2 pkgs/tools/graphics/mscgen/default.nix
18 changes: 16 additions & 2 deletions pkgs/tools/graphics/mscgen/default.nix
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,15 @@
{ stdenv, fetchurl, flex, bison, gd, libpng, libjpeg, freetype, zlib, libwebp, runtimeShell }:
{ stdenv
, bison
, fetchurl
, flex
, gd
, libjpeg
, libpng
, libwebp
, pkg-config
, runtimeShell
, zlib
}:

let
version = "0.20";
@@ -12,13 +23,16 @@ stdenv.mkDerivation {
sha256 = "3c3481ae0599e1c2d30b7ed54ab45249127533ab2f20e768a0ae58d8551ddc23";
};

buildInputs = [ flex bison gd libjpeg libpng freetype zlib libwebp ];
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";