summary refs log tree commit diff
path: root/pkgs/tools/graphics/graphviz/default.nix
diff options
context:
space:
mode:
authorAaron Jheng <wentworth@outlook.com>2022-11-24 03:22:47 +0000
committerAaron Jheng <wentworth@outlook.com>2022-11-25 12:37:08 +0000
commitdc3614605fc435c06d159db8fd69c381f4b50578 (patch)
treec8c289c20a79a699d0d6442ccfaf64db84cb4976 /pkgs/tools/graphics/graphviz/default.nix
parentf8c61f361e3024065e6e1b05294cde6614fd6000 (diff)
downloadnixpkgs-dc3614605fc435c06d159db8fd69c381f4b50578.tar
nixpkgs-dc3614605fc435c06d159db8fd69c381f4b50578.tar.gz
nixpkgs-dc3614605fc435c06d159db8fd69c381f4b50578.tar.bz2
nixpkgs-dc3614605fc435c06d159db8fd69c381f4b50578.tar.lz
nixpkgs-dc3614605fc435c06d159db8fd69c381f4b50578.tar.xz
nixpkgs-dc3614605fc435c06d159db8fd69c381f4b50578.tar.zst
nixpkgs-dc3614605fc435c06d159db8fd69c381f4b50578.zip
graphviz: 7.0.0 -> 7.0.2
Diffstat (limited to 'pkgs/tools/graphics/graphviz/default.nix')
-rw-r--r--pkgs/tools/graphics/graphviz/default.nix19
1 files changed, 4 insertions, 15 deletions
diff --git a/pkgs/tools/graphics/graphviz/default.nix b/pkgs/tools/graphics/graphviz/default.nix
index aaf42193ce7..98d2c63d1bf 100644
--- a/pkgs/tools/graphics/graphviz/default.nix
+++ b/pkgs/tools/graphics/graphviz/default.nix
@@ -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 ''