Revert opam solver dependency changes

- Reverts the change to the monolithic `clingo` package in favor of the
  previous split between `clasp` and `gringo` since `opam` works with
  the latter but not (for some reason) with the former.

- Adds explicit non-support for Python in `gringo`. This is not necessary
  for opam.

- Forces usage of the `std::to_string` functions in the C++ standard
  library instead of the incomplete alternative implementations inside
  of the `gringo` sources.
This commit is contained in:
Jesse Haber-Kucharsky
2016-11-12 08:39:52 -05:00
parent c2b4a0d266
commit 51b04c1bf5
6 changed files with 66 additions and 41 deletions
+3 -3
View File
@@ -1,5 +1,5 @@
{ stdenv, fetchurl,
boost, clasp, cmake, clingo, re2c
boost, clasp, cmake, gringo, re2c
}:
let
@@ -14,11 +14,11 @@ stdenv.mkDerivation rec {
sha256 = "029035vcdk527ssf126i8ipi5zs73gqpbrg019pvm9r24rf0m373";
};
buildInputs = [ boost clasp cmake clingo re2c ];
buildInputs = [ boost clasp cmake gringo re2c ];
buildPhase = ''
cmake -DCMAKE_BUILD_TYPE=Release \
-DGRINGO_LOC=${clingo}/bin/gringo \
-DGRINGO_LOC=${gringo}/bin/gringo \
-DCLASP_LOC=${clasp}/bin/clasp \
-DENCODING_LOC=$out/share/aspcud/specification.lp \
.