about summary refs log tree commit diff
path: root/pkgs/tools/misc/aspcud
diff options
context:
space:
mode:
authorJesse Haber-Kucharsky <jesse@haberkucharsky.com>2016-11-12 07:26:30 -0500
committerJesse Haber-Kucharsky <jesse@haberkucharsky.com>2016-11-12 08:39:52 -0500
commit51b04c1bf518cfb5053557491e99dc6ff64cc416 (patch)
tree88df29a46e4429b02f24ca126b58d8dd66e3e1f8 /pkgs/tools/misc/aspcud
parentc2b4a0d2668fda88430e7067245fc63d977ea28c (diff)
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.
Diffstat (limited to 'pkgs/tools/misc/aspcud')
-rw-r--r--pkgs/tools/misc/aspcud/default.nix6
1 files changed, 3 insertions, 3 deletions
diff --git a/pkgs/tools/misc/aspcud/default.nix b/pkgs/tools/misc/aspcud/default.nix
index 0bdcfa76fec1f..577c0a33b3eee 100644
--- a/pkgs/tools/misc/aspcud/default.nix
+++ b/pkgs/tools/misc/aspcud/default.nix
@@ -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 \
       .