graphviz: 7.0.0 -> 7.0.2
This commit is contained in:
@@ -30,13 +30,13 @@ let
|
||||
in
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "graphviz";
|
||||
version = "7.0.0";
|
||||
version = "7.0.2";
|
||||
|
||||
src = fetchFromGitLab {
|
||||
owner = "graphviz";
|
||||
repo = "graphviz";
|
||||
rev = version;
|
||||
sha256 = "sha256-n+g4XNTSbCXOoL7JIE6uP9AZJj3YDfTG9EcmUA+r8hY=";
|
||||
hash = "sha256-iCpIKTGXZ1R3mbpbwv5ztdtjY7p9/NsJlA6u5lfpgdY=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
@@ -65,26 +65,15 @@ stdenv.mkDerivation rec {
|
||||
configureFlags = [
|
||||
"--with-ltdl-lib=${libtool.lib}/lib"
|
||||
"--with-ltdl-include=${libtool}/include"
|
||||
] ++ lib.optional (xorg == null) "--without-x";
|
||||
] ++ optional (xorg == null) "--without-x";
|
||||
|
||||
enableParallelBuilding = true;
|
||||
|
||||
CPPFLAGS = lib.optionalString (withXorg && stdenv.isDarwin)
|
||||
CPPFLAGS = optionalString (withXorg && stdenv.isDarwin)
|
||||
"-I${cairo.dev}/include/cairo";
|
||||
|
||||
# ''
|
||||
# substituteInPlace rtest/rtest.sh \
|
||||
# --replace "/bin/ksh" "${mksh}/bin/mksh"
|
||||
# '';
|
||||
|
||||
doCheck = false; # fails with "Graphviz test suite requires ksh93" which is not in nixpkgs
|
||||
|
||||
postPatch = ''
|
||||
for f in $(find . -name Makefile.in); do
|
||||
substituteInPlace $f --replace "-lstdc++" "-lc++"
|
||||
done
|
||||
'';
|
||||
|
||||
preAutoreconf = "./autogen.sh";
|
||||
|
||||
postFixup = optionalString withXorg ''
|
||||
|
||||
Reference in New Issue
Block a user