diff options
author | Vladimír Čunát <vcunat@gmail.com> | 2016-04-07 14:35:03 +0200 |
---|---|---|
committer | Vladimír Čunát <vcunat@gmail.com> | 2016-04-07 14:40:51 +0200 |
commit | d1df28f8e5b98be01417ffc1032020415390f2a0 (patch) | |
tree | 0e2024acd74c6ce3fb4614eadb04abe632835f71 /pkgs/development/interpreters/luajit | |
parent | 056b5a1a5f2a4096dd39db2265e5ca369c03ec15 (diff) | |
parent | c55cfe0cb3425fb926219cf7dde8714f3d143744 (diff) |
Merge 'staging' into closure-size
This is mainly to get the update of bootstrap tools. Otherwise there were mysterious segfaults: https://github.com/NixOS/nixpkgs/pull/7701#issuecomment-203389817
Diffstat (limited to 'pkgs/development/interpreters/luajit')
-rw-r--r-- | pkgs/development/interpreters/luajit/default.nix | 13 |
1 files changed, 9 insertions, 4 deletions
diff --git a/pkgs/development/interpreters/luajit/default.nix b/pkgs/development/interpreters/luajit/default.nix index ab57d285288ab..23ea2fd655288 100644 --- a/pkgs/development/interpreters/luajit/default.nix +++ b/pkgs/development/interpreters/luajit/default.nix @@ -2,11 +2,12 @@ stdenv.mkDerivation rec { name = "luajit-${version}"; - version = "2.0.4"; + version = "2.1.0-beta1"; + luaversion = "5.1"; src = fetchurl { url = "http://luajit.org/download/LuaJIT-${version}.tar.gz"; - sha256 = "0zc0y7p6nx1c0pp4nhgbdgjljpfxsb5kgwp4ysz22l1p2bms83v2"; + sha256 = "06170d38387c59d1292001a166e7f5524f5c5deafa8705a49a46fa42905668dd"; }; enableParallelBuilding = true; @@ -24,13 +25,17 @@ stdenv.mkDerivation rec { configurePhase = false; buildFlags = [ "amalg" ]; # Build highly optimized version - installPhase = "make install PREFIX=$out"; + installPhase = '' + make install INSTALL_INC=$out/include PREFIX=$out + ln -s $out/bin/luajit* $out/bin/lua + ln -s $out/bin/luajit* $out/bin/luajit + ''; meta = with stdenv.lib; { description = "high-performance JIT compiler for Lua 5.1"; homepage = http://luajit.org; license = licenses.mit; platforms = platforms.linux ++ platforms.darwin; - maintainers = [ maintainers.thoughtpolice ]; + maintainers = with maintainers ; [ thoughtpolice smironov ]; }; } |