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

graphviz: 2.38.0 -> 2.40.1

This commit is contained in:
Michael Raskin 2017-01-02 18:04:30 +01:00
parent a36c7deb04
commit f38f46ee41
1 changed files with 6 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
pkgs/tools/graphics/graphviz/default.nix
View File

@ -4,23 +4,17 @@
}: }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
version = "2.38.0"; version = "2.40.1";
name = "graphviz-${version}"; name = "graphviz-${version}";
src = fetchurl { src = fetchurl {
url = "http://www.graphviz.org/pub/graphviz/ARCHIVE/${name}.tar.gz"; url = "http://www.graphviz.org/pub/graphviz/ARCHIVE/${name}.tar.gz";
sha256 = "17l5czpvv5ilmg17frg0w4qwf89jzh2aglm9fgx0l0aakn6j7al1"; sha256 = "08d4ygkxz2f553bxj6087da56a23kx1khv0j8ycxa102vvx1hlna";
}; };
hardeningDisable = [ "fortify" ]; hardeningDisable = [ "fortify" ];
patches = patches = [ ];
[ ./0001-vimdot-lookup-vim-in-PATH.patch
# NOTE: Once this patch is removed, flex can probably be removed from
# buildInputs.
./cve-2014-9157.patch
];
buildInputs = buildInputs =
[ pkgconfig libpng libjpeg expat yacc libtool fontconfig gd gts libdevil flex pango [ pkgconfig libpng libjpeg expat yacc libtool fontconfig gd gts libdevil flex pango
@ -33,11 +27,13 @@ stdenv.mkDerivation rec {
configureFlags = stdenv.lib.optional (xorg == null) "--without-x"; configureFlags = stdenv.lib.optional (xorg == null) "--without-x";
postPatch = stdenv.lib.optionalString stdenv.isDarwin '' postPatch = (stdenv.lib.optionalString stdenv.isDarwin ''
for foo in cmd/dot/Makefile.in cmd/edgepaint/Makefile.in \ for foo in cmd/dot/Makefile.in cmd/edgepaint/Makefile.in \
cmd/mingle/Makefile.in plugin/gdiplus/Makefile.in; do cmd/mingle/Makefile.in plugin/gdiplus/Makefile.in; do
substituteInPlace "$foo" --replace "-lstdc++" "-lc++" substituteInPlace "$foo" --replace "-lstdc++" "-lc++"
done done
'') + ''
substituteInPlace "plugin/xlib/vimdot.sh" --replace "/usr/bin/vim" "\$(command -v vim)"
''; '';
preBuild = '' preBuild = ''