Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix texlive on darwin #19800

Merged
merged 2 commits into from
Oct 26, 2016
+16 −12
Merged

Fix texlive on darwin #19800

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
6f7504d
clisp: Unbreak on Darwin
mikesperber Oct 23, 2016
0fba729
xindy: add dependency on libiconv
mikesperber Oct 23, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
24 changes: 14 additions & 10 deletions pkgs/development/interpreters/clisp/default.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,18 +5,18 @@
# - full: contains base plus modules in withModules
{ stdenv, fetchurl, libsigsegv, gettext, ncurses, readline, libX11
, libXau, libXt, pcre, zlib, libXpm, xproto, libXext, xextproto
, libffi, libffcall, coreutils
, libffi
, libffcall
, coreutils
# build options
, threadSupport ? (stdenv.isi686 || stdenv.isx86_64)
, x11Support ? (stdenv.isi686 || stdenv.isx86_64)
, dllSupport ? true
, withModules ? [
"bindings/glibc"
"pcre"
"rawsock"
"wildcard"
"zlib"
]
++ stdenv.lib.optionals stdenv.isLinux [ "bindings/glibc" "zlib" "wildcard" ]
++ stdenv.lib.optional x11Support "clx/new-clx"
}:

Expand All @@ -33,15 +33,17 @@ stdenv.mkDerivation rec {
};

inherit libsigsegv gettext coreutils;


ffcallAvailable = stdenv.isLinux && (libffcall != null);

buildInputs = [libsigsegv]
++ stdenv.lib.optional (gettext != null) gettext
++ stdenv.lib.optional (ncurses != null) ncurses
++ stdenv.lib.optional (pcre != null) pcre
++ stdenv.lib.optional (zlib != null) zlib
++ stdenv.lib.optional (readline != null) readline
++ stdenv.lib.optional (libffi != null) libffi
++ stdenv.lib.optional (libffcall != null) libffcall
++ stdenv.lib.optional (ffcallAvailable && (libffi != null)) libffi
++ stdenv.lib.optional ffcallAvailable libffcall
++ stdenv.lib.optionals x11Support [
libX11 libXau libXt libXpm xproto libXext xextproto
];
Expand All @@ -64,8 +66,10 @@ stdenv.mkDerivation rec {
configureFlags = "builddir"
+ stdenv.lib.optionalString (!dllSupport) " --without-dynamic-modules"
+ stdenv.lib.optionalString (readline != null) " --with-readline"
+ stdenv.lib.optionalString (libffi != null) " --with-dynamic-ffi"
+ stdenv.lib.optionalString (libffcall != null) " --with-ffcall"
# --with-dynamic-ffi can only exist with --with-ffcall - foreign.d does not compile otherwise
+ 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.optionalString threadSupport " --with-threads=POSIX_THREADS";

Expand All @@ -88,6 +92,6 @@ stdenv.mkDerivation rec {
description = "ANSI Common Lisp Implementation";
homepage = http://clisp.cons.org;
maintainers = with stdenv.lib.maintainers; [raskin tohl];
platforms = stdenv.lib.platforms.linux;
platforms = stdenv.lib.platforms.unix;
};
}
4 changes: 2 additions & 2 deletions pkgs/tools/typesetting/tex/texlive/bin.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{ stdenv, lib, fetchurl
, 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
, xextproto, perl, libSM, ruby, expat, curl, libjpeg, python, fontconfig, pkgconfig
, poppler, libpaper, graphite2, zziplib, harfbuzz, texinfo, potrace, gmp, mpfr
Expand Down Expand Up @@ -296,7 +296,7 @@ xindy = stdenv.mkDerivation {
pkgconfig perl
(texlive.combine { inherit (texlive) scheme-basic cyrillic ec; })
];
buildInputs = [ clisp ];
buildInputs = [ clisp libiconv ];

configureFlags = [ "--with-clisp-runtime=system" "--disable-xindy-docs" ];

Expand Down