Merge commit '22a3bf9fb9edad917fb6cd1066d58b5e426ee975'

1 files changed, 11 insertions, 1 deletions

diff --git a/nixpkgs/pkgs/development/coq-modules/dpdgraph/default.nix b/nixpkgs/pkgs/development/coq-modules/dpdgraph/default.nix
index 300c5a9f4482..689745003df2 100644
--- a/nixpkgs/pkgs/development/coq-modules/dpdgraph/default.nix
+++ b/nixpkgs/pkgs/development/coq-modules/dpdgraph/default.nix
@@ -36,6 +36,8 @@ let params = {
 param = params.${coq.coq-version};
 in
 
+let hasWarning = stdenv.lib.versionAtLeast coq.ocamlPackages.ocaml.version "4.08"; in
+
 stdenv.mkDerivation {
   name = "coq${coq.coq-version}-dpdgraph-${param.version}";
   src = fetchFromGitHub {
@@ -49,6 +51,14 @@ stdenv.mkDerivation {
   buildInputs = [ coq ]
   ++ (with coq.ocamlPackages; [ ocaml camlp5 findlib ocamlgraph ]);
 
+  # dpd_compute.ml uses deprecated Pervasives.compare
+  # Versions prior to 0.6.5 do not have the WARN_ERR build flag
+  preConfigure = stdenv.lib.optionalString hasWarning ''
+    substituteInPlace Makefile.in --replace "-warn-error +a " ""
+  '';
+
+  buildFlags = stdenv.lib.optional hasWarning "WARN_ERR=";
+
   preInstall = ''
     mkdir -p $out/bin
   '';
@@ -61,7 +71,7 @@ stdenv.mkDerivation {
   meta = {
     description = "Build dependency graphs between Coq objects";
     license = stdenv.lib.licenses.lgpl21;
-    homepage = https://github.com/Karmaki/coq-dpdgraph/;
+    homepage = "https://github.com/Karmaki/coq-dpdgraph/";
     maintainers = with stdenv.lib.maintainers; [ vbgl ];
     platforms = coq.meta.platforms;
   };