Merge pull request #175039 from azahi/clingcon-fix

clingcon: fix build
2022-05-28 12:40:54 +01:00 · 2022-05-28 12:40:54 +01:00 · 17b62c338f
commit 17b62c338f
parent c48756aae2 aa8447dd0c
2 changed files with 28 additions and 0 deletions
--- a/pkgs/applications/science/logic/potassco/clingcon.nix
+++ b/pkgs/applications/science/logic/potassco/clingcon.nix
@ -16,6 +16,10 @@ stdenv.mkDerivation rec {
    sha256 = "1g2xkz9nsgqnrw3fdf5jchl16f0skj5mm32va61scc2yrchll166";
   };

+  patches = [
+    ./clingcon_limits.patch
+  ];
+
  postPatch = ''
    cp ${catch2}/include/catch2/catch.hpp libclingcon/tests/catch.hpp
  '';
--- a/pkgs/applications/science/logic/potassco/clingcon_limits.patch
+++ b/pkgs/applications/science/logic/potassco/clingcon_limits.patch
@ -0,0 +1,24 @@
+diff --git i/libclingcon/clingcon/base.hh w/libclingcon/clingcon/base.hh
+index 2d449fe..0b5fa17 100644
+--- i/libclingcon/clingcon/base.hh
+++ w/libclingcon/clingcon/base.hh
+@@ -28,6 +28,7 @@
+ #include <clingo.hh>
+ #include <optional>
+ #include <forward_list>
+#include <limits>
+ 
+ //! @file clingcon/base.hh
+ //! Basic data types.
+diff --git i/libclingcon/clingcon/util.hh w/libclingcon/clingcon/util.hh
+index df4cddd..308259e 100644
+--- i/libclingcon/clingcon/util.hh
+++ w/libclingcon/clingcon/util.hh
+@@ -30,6 +30,7 @@
+ #include <map>
+ #include <cstdlib>
+ #include <stdexcept>
+#include <limits>
+ 
+ //! @file clingcon/util.hh
+ //! Very general utility functions.