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: 052e4baf0a23
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: f64c01fa797d
Choose a head ref
  • 2 commits
  • 1 file changed
  • 2 contributors

Commits on Aug 2, 2018

  1. Add missing dependencies for swi-prolog 

    In the previous version of this derivation, when the command

?- check_installation.

was issued in the swipl prompt, five errors were encountered. This patch fixes
that, so that the installation is correctly checked.

This enables the usage of the command pack_install to install prolog libraries,
which otherwise fails for the lack of libarchive.
    @meditans
    meditans committed Aug 2, 2018
    Copy the full SHA
    bc96cec View commit details

Commits on Aug 3, 2018

  1. Merge pull request #44380 from meditans/swi-prolog-check-installation 

    Add missing dependencies for swi-prolog
    @peti
    peti authored Aug 3, 2018

    Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
    GPG key ID: 4AEE18F83AFDEB23
    Expired
    Verified
    Learn about vigilant mode
    Copy the full SHA
    f64c01f View commit details
Showing with 5 additions and 4 deletions.
  1. +5 −4 pkgs/development/compilers/swi-prolog/default.nix
9 changes: 5 additions & 4 deletions pkgs/development/compilers/swi-prolog/default.nix
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{ stdenv, fetchurl, jdk, gmp, readline, openssl, libjpeg, unixODBC, zlib
, libXinerama, libXft, libXpm, libSM, libXt, freetype, pkgconfig
, fontconfig, makeWrapper ? stdenv.isDarwin
, libXinerama, libarchive, db, pcre, libedit, libossp_uuid, libXft, libXpm
, libSM, libXt, freetype, pkgconfig, fontconfig, makeWrapper ? stdenv.isDarwin
}:

let
@@ -15,7 +15,8 @@ stdenv.mkDerivation {
};

buildInputs = [ jdk gmp readline openssl libjpeg unixODBC libXinerama
libXft libXpm libSM libXt zlib freetype pkgconfig fontconfig ]
libarchive db pcre libedit libossp_uuid libXft libXpm libSM libXt
zlib freetype pkgconfig fontconfig ]
++ stdenv.lib.optional stdenv.isDarwin makeWrapper;

hardeningDisable = [ "format" ];
@@ -42,6 +43,6 @@ stdenv.mkDerivation {
license = "LGPL";

platforms = stdenv.lib.platforms.unix;
maintainers = [ stdenv.lib.maintainers.peti ];
maintainers = [ stdenv.lib.maintainers.peti stdenv.lib.maintainers.meditans ];
};
}