@@ -1,22 +1,30 @@
1−{ stdenv, fetchurl, jdk, gmp, readline, openssl, libjpeg, unixODBC, zlib
1+{ stdenv, fetchgit, jdk, gmp, readline, openssl, libjpeg, unixODBC, zlib
22, libXinerama, libarchive, db, pcre, libedit, libossp_uuid, libXft, libXpm
33, libSM, libXt, freetype, pkgconfig, fontconfig, makeWrapper ? stdenv.isDarwin
4+, git, cacert, cmake, libyaml
5+, extraLibraries ? [ jdk unixODBC libXpm libSM libXt freetype fontconfig ]
6+, extraPacks ? []
47}:
58
69let
7− version = "7.6.4";
10+ version = "8.1.4";
11+ packInstall = swiplPath: pack:
12+ ''${swiplPath}/bin/swipl -g "pack_install(${pack}, [package_directory(\"${swiplPath}/lib/swipl/pack\"), silent(true), interactive(false)])." -t "halt."
13+ '';
814in
915stdenv.mkDerivation {
1016 name = "swi-prolog-${version}";
1117
12− src = fetchurl {
13− url = "http://www.swi-prolog.org/download/stable/src/swipl-${version}.tar.gz";
14− sha256 = "14bq4sqs61maqpnmgy6687jjj0shwc27cpfsqbf056nrssmplg9d";
18+ src = fetchgit {
19+ url = "https://github.com/SWI-Prolog/swipl-devel";
20+ rev = "V${version}";
21+ sha256 = "0qxa6f5dypwczxajlf0l736adbjb17cbak3qsh5g04hpv2bxm6dh";
1522 };
1623
17− buildInputs = [ jdk gmp readline openssl libjpeg unixODBC libXinerama
18− libarchive db pcre libedit libossp_uuid libXft libXpm libSM libXt
19− zlib freetype pkgconfig fontconfig ]
24+ buildInputs = [ cacert git cmake gmp readline openssl
25+ libarchive libyaml db pcre libedit libossp_uuid
26+ zlib pkgconfig ]
27+ ++ extraLibraries
2028 ++ stdenv.lib.optional stdenv.isDarwin makeWrapper;
2129
2230 hardeningDisable = [ "format" ];
@@ -27,7 +35,20 @@ stdenv.mkDerivation {
2735 "--enable-shared"
2836 ];
2937
30− buildFlags = "world";
38+ installPhase = ''
39+ mkdir -p $out
40+ mkdir build
41+ cd build
42+ ${cmake}/bin/cmake -DCMAKE_INSTALL_PREFIX=$out ..
43+ cd ../
44+ make
45+ make install
46+ make clean
47+ mkdir -p $out/lib/swipl/pack
48+ ''
49+ + builtins.concatStringsSep "\n"
50+ ( builtins.map (packInstall "$out") extraPacks
51+ );
3152
3253 # For macOS: still not fixed in upstream: "abort trap 6" when called
3354 # through symlink, so wrap binary.