mirror of
https://github.com/NixOS/nixpkgs.git
synced 2024-11-23 23:43:30 +00:00
graphviz: 2.38.0 -> 2.40.1
This commit is contained in:
parent
a36c7deb04
commit
f38f46ee41
@ -4,23 +4,17 @@
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
version = "2.38.0";
|
||||
version = "2.40.1";
|
||||
name = "graphviz-${version}";
|
||||
|
||||
src = fetchurl {
|
||||
url = "http://www.graphviz.org/pub/graphviz/ARCHIVE/${name}.tar.gz";
|
||||
sha256 = "17l5czpvv5ilmg17frg0w4qwf89jzh2aglm9fgx0l0aakn6j7al1";
|
||||
sha256 = "08d4ygkxz2f553bxj6087da56a23kx1khv0j8ycxa102vvx1hlna";
|
||||
};
|
||||
|
||||
hardeningDisable = [ "fortify" ];
|
||||
|
||||
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
|
||||
];
|
||||
patches = [ ];
|
||||
|
||||
buildInputs =
|
||||
[ 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";
|
||||
|
||||
postPatch = stdenv.lib.optionalString stdenv.isDarwin ''
|
||||
postPatch = (stdenv.lib.optionalString stdenv.isDarwin ''
|
||||
for foo in cmd/dot/Makefile.in cmd/edgepaint/Makefile.in \
|
||||
cmd/mingle/Makefile.in plugin/gdiplus/Makefile.in; do
|
||||
substituteInPlace "$foo" --replace "-lstdc++" "-lc++"
|
||||
done
|
||||
'') + ''
|
||||
substituteInPlace "plugin/xlib/vimdot.sh" --replace "/usr/bin/vim" "\$(command -v vim)"
|
||||
'';
|
||||
|
||||
preBuild = ''
|
||||
|
Loading…
Reference in New Issue
Block a user