diff options
Diffstat (limited to 'nixpkgs/pkgs/development/interpreters/clisp/hg.nix')
| -rw-r--r-- | nixpkgs/pkgs/development/interpreters/clisp/hg.nix | 44 |
1 files changed, 22 insertions, 22 deletions
diff --git a/nixpkgs/pkgs/development/interpreters/clisp/hg.nix b/nixpkgs/pkgs/development/interpreters/clisp/hg.nix index 6898f84669f7..83a1870d182b 100644 --- a/nixpkgs/pkgs/development/interpreters/clisp/hg.nix +++ b/nixpkgs/pkgs/development/interpreters/clisp/hg.nix @@ -3,7 +3,7 @@ # - base (default): contains readline and i18n, regexp and syscalls modules # by default # - full: contains base plus modules in withModules -{ stdenv, fetchhg, libsigsegv, gettext, ncurses, readline, libX11 +{ lib, stdenv, fetchhg, libsigsegv, gettext, ncurses, readline, libX11 , libXau, libXt, pcre, zlib, libXpm, xorgproto, libXext , libffi, libffcall, automake , coreutils @@ -15,8 +15,8 @@ "pcre" "rawsock" ] - ++ stdenv.lib.optionals stdenv.isLinux [ "bindings/glibc" "zlib" ] - ++ stdenv.lib.optional x11Support "clx/new-clx" + ++ lib.optionals stdenv.isLinux [ "bindings/glibc" "zlib" ] + ++ lib.optional x11Support "clx/new-clx" }: assert x11Support -> (libX11 != null && libXau != null && libXt != null @@ -38,14 +38,14 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ automake ]; # sometimes fails otherwise 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 (ffcallAvailable && (libffi != null)) libffi - ++ stdenv.lib.optional ffcallAvailable libffcall - ++ stdenv.lib.optionals x11Support [ + ++ lib.optional (gettext != null) gettext + ++ lib.optional (ncurses != null) ncurses + ++ lib.optional (pcre != null) pcre + ++ lib.optional (zlib != null) zlib + ++ lib.optional (readline != null) readline + ++ lib.optional (ffcallAvailable && (libffi != null)) libffi + ++ lib.optional ffcallAvailable libffcall + ++ lib.optionals x11Support [ libX11 libXau libXt libXpm xorgproto libXext ]; @@ -63,14 +63,14 @@ stdenv.mkDerivation rec { ''; configureFlags = [ "builddir" ] - ++ stdenv.lib.optional (!dllSupport) "--without-dynamic-modules" - ++ stdenv.lib.optional (readline != null) "--with-readline" + ++ lib.optional (!dllSupport) "--without-dynamic-modules" + ++ lib.optional (readline != null) "--with-readline" # --with-dynamic-ffi can only exist with --with-ffcall - foreign.d does not compile otherwise - ++ stdenv.lib.optional (ffcallAvailable && (libffi != null)) "--with-dynamic-ffi" - ++ stdenv.lib.optional ffcallAvailable "--with-ffcall" - ++ stdenv.lib.optional (!ffcallAvailable) "--without-ffcall" + ++ lib.optional (ffcallAvailable && (libffi != null)) "--with-dynamic-ffi" + ++ lib.optional ffcallAvailable "--with-ffcall" + ++ lib.optional (!ffcallAvailable) "--without-ffcall" ++ builtins.map (x: " --with-module=" + x) withModules - ++ stdenv.lib.optional threadSupport "--with-threads=POSIX_THREADS"; + ++ lib.optional threadSupport "--with-threads=POSIX_THREADS"; preBuild = '' sed -e '/avcall.h/a\#include "config.h"' -i src/foreign.d @@ -79,11 +79,11 @@ stdenv.mkDerivation rec { ''; postInstall = - stdenv.lib.optionalString (withModules != []) + lib.optionalString (withModules != []) (''./clisp-link add "$out"/lib/clisp*/base "$(dirname "$out"/lib/clisp*/base)"/full'' - + stdenv.lib.concatMapStrings (x: " " + x) withModules); + + lib.concatMapStrings (x: " " + x) withModules); - NIX_CFLAGS_COMPILE = "-O0 ${stdenv.lib.optionalString (!stdenv.is64bit) "-falign-functions=4"}"; + NIX_CFLAGS_COMPILE = "-O0 ${lib.optionalString (!stdenv.is64bit) "-falign-functions=4"}"; # TODO : make mod-check fails doCheck = false; @@ -91,8 +91,8 @@ stdenv.mkDerivation rec { meta = { description = "ANSI Common Lisp Implementation"; homepage = "http://clisp.cons.org"; - maintainers = with stdenv.lib.maintainers; [raskin tohl]; + maintainers = with lib.maintainers; [raskin tohl]; # problems on Darwin: https://github.com/NixOS/nixpkgs/issues/20062 - platforms = stdenv.lib.platforms.linux; + platforms = lib.platforms.linux; }; } |