Merge pull request #36956 from coreyoconnor/merge

Merge swi-prolog 7.4.2 -> 7.6.4 plus enable JPL feature
This commit is contained in:
Gabriel Ebner 2018-03-17 18:23:11 +01:00 committed by GitHub
commit f54cd16ba5
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -1,20 +1,20 @@
{ stdenv, fetchurl, gmp, readline, openssl, libjpeg, unixODBC, zlib
{ stdenv, fetchurl, jdk, gmp, readline, openssl, libjpeg, unixODBC, zlib
, libXinerama, libXft, libXpm, libSM, libXt, freetype, pkgconfig
, fontconfig, makeWrapper ? stdenv.isDarwin
}:
let
version = "7.4.2";
version = "7.6.4";
in
stdenv.mkDerivation {
name = "swi-prolog-${version}";
src = fetchurl {
url = "http://www.swi-prolog.org/download/stable/src/swipl-${version}.tar.gz";
sha256 = "12yzy3w2l1p9fv77lv20xbqq47d0zjw5rkz96mx1xg1lldyja5vz";
sha256 = "14bq4sqs61maqpnmgy6687jjj0shwc27cpfsqbf056nrssmplg9d";
};
buildInputs = [ gmp readline openssl libjpeg unixODBC libXinerama
buildInputs = [ jdk gmp readline openssl libjpeg unixODBC libXinerama
libXft libXpm libSM libXt zlib freetype pkgconfig fontconfig ]
++ stdenv.lib.optional stdenv.isDarwin makeWrapper;