public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #70724 from yrashk/swipl-gui

Browse Source 
swipl: include GUI tools
This commit is contained in:
worldofpeace 2019-10-14 22:41:56 +00:00 committed by GitHub
commit 516e61a69e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
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

@ -8541,6 +8541,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 { };