Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: ac1aeb4fbbed
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 516e61a69eec
Choose a head ref
  • 2 commits
  • 2 files changed
  • 2 contributors

Commits on Oct 10, 2019

  1. swipl: include GUI tools 

    swi-prolog currently misses GUI packages / tools (xpce, prolog_ide)
due to missing X dependencies.
    @yrashk
    yrashk committed Oct 10, 2019
    Copy the full SHA
    e0d7a96 View commit details

Commits on Oct 14, 2019

  1. Merge pull request #70724 from yrashk/swipl-gui 

    swipl: include GUI tools
    @worldofpeace
    worldofpeace authored Oct 14, 2019
    Copy the full SHA
    516e61a View commit details
Showing with 5 additions and 1 deletion.
  1. +4 −1 pkgs/development/compilers/swi-prolog/default.nix
  2. +1 −0 pkgs/top-level/all-packages.nix
5 changes: 4 additions & 1 deletion pkgs/development/compilers/swi-prolog/default.nix
View file
Original file line number Diff line number Diff line change
@@ -2,8 +2,10 @@
, libarchive, db, pcre, libedit, libossp_uuid, libXpm
, libSM, libXt, freetype, pkgconfig, fontconfig, makeWrapper ? stdenv.isDarwin
, git, cacert, cmake, libyaml
, libjpeg, libX11, libXext, libXft, libXinerama
, extraLibraries ? [ jdk unixODBC libXpm libSM libXt freetype fontconfig ]
, extraPacks ? []
, withGui ? false
}:

let
@@ -25,6 +27,7 @@ stdenv.mkDerivation {
buildInputs = [ cacert git cmake gmp readline openssl
libarchive libyaml db pcre libedit libossp_uuid
zlib pkgconfig ]
++ stdenv.lib.optionals (withGui && !stdenv.isDarwin) [ libXpm libX11 libXext libXft libXinerama libjpeg ]
++ extraLibraries
++ stdenv.lib.optional stdenv.isDarwin makeWrapper;

@@ -68,7 +71,7 @@ stdenv.mkDerivation {
description = "A Prolog compiler and interpreter";
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 ];
};
}
1 change: 1 addition & 0 deletions pkgs/top-level/all-packages.nix
View file
Original file line number Diff line number Diff line change
@@ -8541,6 +8541,7 @@ in
swift = callPackage ../development/compilers/swift { };

swiProlog = callPackage ../development/compilers/swi-prolog { };
swiPrologWithGui = callPackage ../development/compilers/swi-prolog { withGui = true; };

tbb = callPackage ../development/libraries/tbb { };