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

Merge remote-tracking branch 'upstream/master' into staging

Browse Source
This commit is contained in:
Tuomas Tynkkynen
2018-08-04 15:17:42 +03:00
parent 7a337cde31 20f1388c3f
commit 008fd5fcf5
132 changed files with 6166 additions and 2582 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
pkgs/development/compilers/swi-prolog/default.nix
View File

@@ -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" ];
@@ -46,6 +47,6 @@ stdenv.mkDerivation {
license = "LGPL";
platforms = stdenv.lib.platforms.unix;
maintainers = [ stdenv.lib.maintainers.peti ];
maintainers = [ stdenv.lib.maintainers.peti stdenv.lib.maintainers.meditans ];
};
}