cafkafk/nixpkgs
cafkafk/nixpkgs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 2

swipl: include GUI tools

Browse source 
swi-prolog currently misses GUI packages / tools (xpce, prolog_ide)
due to missing X dependencies.
This commit is contained in:
Yurii Rashkovskii 2019-10-08 13:59:12 +07:00
parent 86e68d02b3
commit e0d7a96903
No known key found for this signature in database
GPG key ID: 1D60D7CFD80845FF
2 changed files with 5 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
pkgs/development/compilers/swi-prolog/default.nix
View file

@ -2,8 +2,10 @@
, libarchive, db, pcre, libedit, libossp_uuid, libXpm , libarchive, db, pcre, libedit, libossp_uuid, libXpm
, libSM, libXt, freetype, pkgconfig, fontconfig, makeWrapper ? stdenv.isDarwin , libSM, libXt, freetype, pkgconfig, fontconfig, makeWrapper ? stdenv.isDarwin
, git, cacert, cmake, libyaml , git, cacert, cmake, libyaml
, libjpeg, libX11, libXext, libXft, libXinerama
, extraLibraries ? [ jdk unixODBC libXpm libSM libXt freetype fontconfig ] , extraLibraries ? [ jdk unixODBC libXpm libSM libXt freetype fontconfig ]
, extraPacks ? [] , extraPacks ? []
, withGui ? false
}: }:
let let
@ -25,6 +27,7 @@ stdenv.mkDerivation {
buildInputs = [ cacert git cmake gmp readline openssl buildInputs = [ cacert git cmake gmp readline openssl
libarchive libyaml db pcre libedit libossp_uuid libarchive libyaml db pcre libedit libossp_uuid
zlib pkgconfig ] zlib pkgconfig ]
++ stdenv.lib.optionals (withGui && !stdenv.isDarwin) [ libXpm libX11 libXext libXft libXinerama libjpeg ]
++ extraLibraries ++ extraLibraries
++ stdenv.lib.optional stdenv.isDarwin makeWrapper; ++ stdenv.lib.optional stdenv.isDarwin makeWrapper;
@ -68,7 +71,7 @@ stdenv.mkDerivation {
description = "A Prolog compiler and interpreter"; description = "A Prolog compiler and interpreter";
license = "LGPL"; license = "LGPL";
platforms = stdenv.lib.platforms.unix; platforms = stdenv.lib.platforms.linux ++ stdenv.lib.optionals (!withGui) stdenv.lib.platforms.darwin;
maintainers = [ stdenv.lib.maintainers.meditans ]; maintainers = [ stdenv.lib.maintainers.meditans ];
}; };
} }

1
pkgs/top-level/all-packages.nix
View file

@ -8495,6 +8495,7 @@ in
swift = callPackage ../development/compilers/swift { }; swift = callPackage ../development/compilers/swift { };
swiProlog = callPackage ../development/compilers/swi-prolog { }; swiProlog = callPackage ../development/compilers/swi-prolog { };
swiPrologWithGui = callPackage ../development/compilers/swi-prolog { withGui = true; };
tbb = callPackage ../development/libraries/tbb { }; tbb = callPackage ../development/libraries/tbb { };