diff options
| author | Ben Siraphob <bensiraphob@gmail.com> | 2021-01-23 20:15:07 +0700 |
|---|---|---|
| committer | Ben Siraphob <bensiraphob@gmail.com> | 2021-01-23 20:29:03 +0700 |
| commit | 001c0cbe54228f88d5634f431fcaf460b8ff4590 (patch) | |
| tree | 01920ebc73d4e3e4b007d67ab0a0640f5d9e39db /pkgs/development/interpreters/luajit | |
| parent | f6a583eeece936a1d917de67194fec4b6c74cf1f (diff) | |
| download | nixpkgs-001c0cbe54228f88d5634f431fcaf460b8ff4590.tar nixpkgs-001c0cbe54228f88d5634f431fcaf460b8ff4590.tar.gz nixpkgs-001c0cbe54228f88d5634f431fcaf460b8ff4590.tar.bz2 nixpkgs-001c0cbe54228f88d5634f431fcaf460b8ff4590.tar.lz nixpkgs-001c0cbe54228f88d5634f431fcaf460b8ff4590.tar.xz nixpkgs-001c0cbe54228f88d5634f431fcaf460b8ff4590.tar.zst nixpkgs-001c0cbe54228f88d5634f431fcaf460b8ff4590.zip | |
pkgs/development/interpreters: stdenv.lib -> lib
Diffstat (limited to 'pkgs/development/interpreters/luajit')
| -rw-r--r-- | pkgs/development/interpreters/luajit/default.nix | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/pkgs/development/interpreters/luajit/default.nix b/pkgs/development/interpreters/luajit/default.nix index e0e15ca3275..860642b0fd2 100644 --- a/pkgs/development/interpreters/luajit/default.nix +++ b/pkgs/development/interpreters/luajit/default.nix @@ -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; |