pkgs/development/interpreters: stdenv.lib -> lib
This commit is contained in:
@@ -1,4 +1,4 @@
|
||||
{ stdenv, fetchFromGitHub, buildPackages
|
||||
{ lib, stdenv, fetchFromGitHub, buildPackages
|
||||
, name ? "luajit-${version}"
|
||||
, isStable
|
||||
, sha256
|
||||
@@ -26,7 +26,7 @@ assert enableValgrindSupport -> valgrind != null;
|
||||
let
|
||||
luaPackages = callPackage ../../lua-modules {lua=self; overrides=packageOverrides;};
|
||||
|
||||
XCFLAGS = with stdenv.lib;
|
||||
XCFLAGS = with lib;
|
||||
optional (!enableFFI) "-DLUAJIT_DISABLE_FFI"
|
||||
++ optional (!enableJIT) "-DLUAJIT_DISABLE_JIT"
|
||||
++ optional enable52Compat "-DLUAJIT_ENABLE_LUA52COMPAT"
|
||||
@@ -59,7 +59,7 @@ stdenv.mkDerivation rec {
|
||||
|
||||
configurePhase = false;
|
||||
|
||||
buildInputs = stdenv.lib.optional enableValgrindSupport valgrind;
|
||||
buildInputs = lib.optional enableValgrindSupport valgrind;
|
||||
|
||||
buildFlags = [
|
||||
"amalg" # Build highly optimized version
|
||||
@@ -70,14 +70,14 @@ stdenv.mkDerivation rec {
|
||||
"CROSS=${stdenv.cc.targetPrefix}"
|
||||
# TODO: when pointer size differs, we would need e.g. -m32
|
||||
"HOST_CC=${buildPackages.stdenv.cc}/bin/cc"
|
||||
] ++ stdenv.lib.optional enableJITDebugModule "INSTALL_LJLIBD=$(INSTALL_LMOD)";
|
||||
] ++ lib.optional enableJITDebugModule "INSTALL_LJLIBD=$(INSTALL_LMOD)";
|
||||
enableParallelBuilding = true;
|
||||
NIX_CFLAGS_COMPILE = XCFLAGS;
|
||||
|
||||
postInstall = ''
|
||||
( cd "$out/include"; ln -s luajit-*/* . )
|
||||
ln -s "$out"/bin/luajit-* "$out"/bin/lua
|
||||
'' + stdenv.lib.optionalString (!isStable) ''
|
||||
'' + lib.optionalString (!isStable) ''
|
||||
ln -s "$out"/bin/luajit-* "$out"/bin/luajit
|
||||
'';
|
||||
|
||||
@@ -99,7 +99,7 @@ stdenv.mkDerivation rec {
|
||||
interpreter = "${self}/bin/lua";
|
||||
};
|
||||
|
||||
meta = with stdenv.lib; {
|
||||
meta = with lib; {
|
||||
description = "High-performance JIT compiler for Lua 5.1";
|
||||
homepage = "http://luajit.org";
|
||||
license = licenses.mit;
|
||||
|
||||
Reference in New Issue
Block a user