From eedc173276dc6f5018d8d5b4a5e1b42a82ec2075 Mon Sep 17 00:00:00 2001 From: Vincent Laporte Date: Mon, 12 Mar 2018 16:51:54 +0000 Subject: [PATCH 1/2] clingo: fix URL --- pkgs/applications/science/logic/potassco/clingo.nix | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/pkgs/applications/science/logic/potassco/clingo.nix b/pkgs/applications/science/logic/potassco/clingo.nix index a73feba97b6..dda4963b26e 100644 --- a/pkgs/applications/science/logic/potassco/clingo.nix +++ b/pkgs/applications/science/logic/potassco/clingo.nix @@ -1,12 +1,13 @@ -{stdenv, fetchurl, cmake}: +{ stdenv, fetchzip, cmake }: + stdenv.mkDerivation rec { name = "${pname}-${version}"; pname = "clingo"; version = "5.2.2"; - src = fetchurl { - url = "https://github.com/potassco/clingo/releases/v${version}.tar.gz"; - sha256 = "1kxzb385g8p9mqm1x9wvjrigifa09w6vj0wl7kradibm5qagh7ns"; + src = fetchzip { + url = "https://github.com/potassco/clingo/archive/v${version}.tar.gz"; + sha256 = "04rjwpna37gzm8vxr09z3z6ay8y8cxbjd8lga7xvqfpn2l178zjm"; }; buildInputs = []; @@ -17,7 +18,7 @@ stdenv.mkDerivation rec { description = "ASP system to ground and solve logic programs"; license = stdenv.lib.licenses.mit; maintainers = [stdenv.lib.maintainers.raskin]; - platforms = stdenv.lib.platforms.linux; + platforms = stdenv.lib.platforms.unix; homepage = "https://potassco.org/"; downloadPage = "https://github.com/potassco/clingo/releases/"; }; From 903f4dd3d45a519e41dac6f4f65b7de6005fdde5 Mon Sep 17 00:00:00 2001 From: Vincent Laporte Date: Mon, 12 Mar 2018 17:07:18 +0000 Subject: [PATCH 2/2] clingo: fix build on non-sandboxed darwin --- pkgs/applications/science/logic/potassco/clingo.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/applications/science/logic/potassco/clingo.nix b/pkgs/applications/science/logic/potassco/clingo.nix index dda4963b26e..6bf19a2a2f4 100644 --- a/pkgs/applications/science/logic/potassco/clingo.nix +++ b/pkgs/applications/science/logic/potassco/clingo.nix @@ -13,6 +13,8 @@ stdenv.mkDerivation rec { buildInputs = []; nativeBuildInputs = [cmake]; + cmakeFlags = [ "-DCLINGO_BUILD_WITH_PYTHON=OFF" ]; + meta = { inherit version; description = "ASP system to ground and solve logic programs";