forked from mirrors/nixpkgs
Merge #19800: fix clisp + xindy -> texlive on Darwin
This commit is contained in:
commit
1cd7466650
|
@ -5,18 +5,18 @@
|
||||||
# - full: contains base plus modules in withModules
|
# - full: contains base plus modules in withModules
|
||||||
{ stdenv, fetchurl, libsigsegv, gettext, ncurses, readline, libX11
|
{ stdenv, fetchurl, libsigsegv, gettext, ncurses, readline, libX11
|
||||||
, libXau, libXt, pcre, zlib, libXpm, xproto, libXext, xextproto
|
, libXau, libXt, pcre, zlib, libXpm, xproto, libXext, xextproto
|
||||||
, libffi, libffcall, coreutils
|
, libffi
|
||||||
|
, libffcall
|
||||||
|
, coreutils
|
||||||
# build options
|
# build options
|
||||||
, threadSupport ? (stdenv.isi686 || stdenv.isx86_64)
|
, threadSupport ? (stdenv.isi686 || stdenv.isx86_64)
|
||||||
, x11Support ? (stdenv.isi686 || stdenv.isx86_64)
|
, x11Support ? (stdenv.isi686 || stdenv.isx86_64)
|
||||||
, dllSupport ? true
|
, dllSupport ? true
|
||||||
, withModules ? [
|
, withModules ? [
|
||||||
"bindings/glibc"
|
|
||||||
"pcre"
|
"pcre"
|
||||||
"rawsock"
|
"rawsock"
|
||||||
"wildcard"
|
|
||||||
"zlib"
|
|
||||||
]
|
]
|
||||||
|
++ stdenv.lib.optionals stdenv.isLinux [ "bindings/glibc" "zlib" "wildcard" ]
|
||||||
++ stdenv.lib.optional x11Support "clx/new-clx"
|
++ stdenv.lib.optional x11Support "clx/new-clx"
|
||||||
}:
|
}:
|
||||||
|
|
||||||
|
@ -34,14 +34,16 @@ stdenv.mkDerivation rec {
|
||||||
|
|
||||||
inherit libsigsegv gettext coreutils;
|
inherit libsigsegv gettext coreutils;
|
||||||
|
|
||||||
|
ffcallAvailable = stdenv.isLinux && (libffcall != null);
|
||||||
|
|
||||||
buildInputs = [libsigsegv]
|
buildInputs = [libsigsegv]
|
||||||
++ stdenv.lib.optional (gettext != null) gettext
|
++ stdenv.lib.optional (gettext != null) gettext
|
||||||
++ stdenv.lib.optional (ncurses != null) ncurses
|
++ stdenv.lib.optional (ncurses != null) ncurses
|
||||||
++ stdenv.lib.optional (pcre != null) pcre
|
++ stdenv.lib.optional (pcre != null) pcre
|
||||||
++ stdenv.lib.optional (zlib != null) zlib
|
++ stdenv.lib.optional (zlib != null) zlib
|
||||||
++ stdenv.lib.optional (readline != null) readline
|
++ stdenv.lib.optional (readline != null) readline
|
||||||
++ stdenv.lib.optional (libffi != null) libffi
|
++ stdenv.lib.optional (ffcallAvailable && (libffi != null)) libffi
|
||||||
++ stdenv.lib.optional (libffcall != null) libffcall
|
++ stdenv.lib.optional ffcallAvailable libffcall
|
||||||
++ stdenv.lib.optionals x11Support [
|
++ stdenv.lib.optionals x11Support [
|
||||||
libX11 libXau libXt libXpm xproto libXext xextproto
|
libX11 libXau libXt libXpm xproto libXext xextproto
|
||||||
];
|
];
|
||||||
|
@ -64,8 +66,10 @@ stdenv.mkDerivation rec {
|
||||||
configureFlags = "builddir"
|
configureFlags = "builddir"
|
||||||
+ stdenv.lib.optionalString (!dllSupport) " --without-dynamic-modules"
|
+ stdenv.lib.optionalString (!dllSupport) " --without-dynamic-modules"
|
||||||
+ stdenv.lib.optionalString (readline != null) " --with-readline"
|
+ stdenv.lib.optionalString (readline != null) " --with-readline"
|
||||||
+ stdenv.lib.optionalString (libffi != null) " --with-dynamic-ffi"
|
# --with-dynamic-ffi can only exist with --with-ffcall - foreign.d does not compile otherwise
|
||||||
+ stdenv.lib.optionalString (libffcall != null) " --with-ffcall"
|
+ stdenv.lib.optionalString (ffcallAvailable && (libffi != null)) " --with-dynamic-ffi"
|
||||||
|
+ stdenv.lib.optionalString ffcallAvailable " --with-ffcall"
|
||||||
|
+ stdenv.lib.optionalString (!ffcallAvailable) " --without-ffcall"
|
||||||
+ stdenv.lib.concatMapStrings (x: " --with-module=" + x) withModules
|
+ stdenv.lib.concatMapStrings (x: " --with-module=" + x) withModules
|
||||||
+ stdenv.lib.optionalString threadSupport " --with-threads=POSIX_THREADS";
|
+ stdenv.lib.optionalString threadSupport " --with-threads=POSIX_THREADS";
|
||||||
|
|
||||||
|
@ -88,6 +92,6 @@ stdenv.mkDerivation rec {
|
||||||
description = "ANSI Common Lisp Implementation";
|
description = "ANSI Common Lisp Implementation";
|
||||||
homepage = http://clisp.cons.org;
|
homepage = http://clisp.cons.org;
|
||||||
maintainers = with stdenv.lib.maintainers; [raskin tohl];
|
maintainers = with stdenv.lib.maintainers; [raskin tohl];
|
||||||
platforms = stdenv.lib.platforms.linux;
|
platforms = stdenv.lib.platforms.unix;
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|
|
@ -1,6 +1,6 @@
|
||||||
{ stdenv, lib, fetchurl
|
{ stdenv, lib, fetchurl
|
||||||
, texlive
|
, texlive
|
||||||
, zlib, bzip2, ncurses, libpng, flex, bison, libX11, libICE, xproto
|
, zlib, bzip2, ncurses, libiconv, libpng, flex, bison, libX11, libICE, xproto
|
||||||
, freetype, t1lib, gd, libXaw, icu, ghostscript, ed, libXt, libXpm, libXmu, libXext
|
, freetype, t1lib, gd, libXaw, icu, ghostscript, ed, libXt, libXpm, libXmu, libXext
|
||||||
, xextproto, perl, libSM, ruby, expat, curl, libjpeg, python, fontconfig, pkgconfig
|
, xextproto, perl, libSM, ruby, expat, curl, libjpeg, python, fontconfig, pkgconfig
|
||||||
, poppler, libpaper, graphite2, zziplib, harfbuzz, texinfo, potrace, gmp, mpfr
|
, poppler, libpaper, graphite2, zziplib, harfbuzz, texinfo, potrace, gmp, mpfr
|
||||||
|
@ -296,7 +296,7 @@ xindy = stdenv.mkDerivation {
|
||||||
pkgconfig perl
|
pkgconfig perl
|
||||||
(texlive.combine { inherit (texlive) scheme-basic cyrillic ec; })
|
(texlive.combine { inherit (texlive) scheme-basic cyrillic ec; })
|
||||||
];
|
];
|
||||||
buildInputs = [ clisp ];
|
buildInputs = [ clisp libiconv ];
|
||||||
|
|
||||||
configureFlags = [ "--with-clisp-runtime=system" "--disable-xindy-docs" ];
|
configureFlags = [ "--with-clisp-runtime=system" "--disable-xindy-docs" ];
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue