diff options
| author | Robert Scott <code@humanleg.org.uk> | 2022-05-28 12:40:54 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-05-28 12:40:54 +0100 |
| commit | 17b62c338f2a0862a58bb6951556beecd98ccda9 (patch) | |
| tree | 8e0f3326ca7a9185ef2ad8e3965c04443bb146ea | |
| parent | Merge pull request #172849 from waldheinz/systemd-boot-builder-downgrade (diff) | |
| parent | clingcon: fix build (diff) | |
| download | nixpkgs-17b62c338f2a0862a58bb6951556beecd98ccda9.tar.gz | |
Merge pull request #175039 from azahi/clingcon-fix
clingcon: fix build
| -rw-r--r-- | pkgs/applications/science/logic/potassco/clingcon.nix | 4 | ||||
| -rw-r--r-- | pkgs/applications/science/logic/potassco/clingcon_limits.patch | 24 |
2 files changed, 28 insertions, 0 deletions
diff --git a/pkgs/applications/science/logic/potassco/clingcon.nix b/pkgs/applications/science/logic/potassco/clingcon.nix index d7ec2e72433e..2238e490a603 100644 --- 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 ''; diff --git a/pkgs/applications/science/logic/potassco/clingcon_limits.patch b/pkgs/applications/science/logic/potassco/clingcon_limits.patch new file mode 100644 index 000000000000..0343e10e2112 --- /dev/null +++ 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. |