diff options
author | Vladimír Čunát <vcunat@gmail.com> | 2014-04-12 10:38:40 +0200 |
---|---|---|
committer | Vladimír Čunát <vcunat@gmail.com> | 2014-04-12 10:38:40 +0200 |
commit | 7be0e37ca2dc8fa6b079baa6e272e3decb011b76 (patch) | |
tree | 5284fb312bb4d47b331d81af5adf847a3afd221a /pkgs/development/interpreters | |
parent | decd2feb0a1bc80940e697fa66e3b25383360c30 (diff) | |
parent | e2bc9a3d14d08ddfaeb08b02065a6adb026e7582 (diff) | |
download | nixlib-7be0e37ca2dc8fa6b079baa6e272e3decb011b76.tar nixlib-7be0e37ca2dc8fa6b079baa6e272e3decb011b76.tar.gz nixlib-7be0e37ca2dc8fa6b079baa6e272e3decb011b76.tar.bz2 nixlib-7be0e37ca2dc8fa6b079baa6e272e3decb011b76.tar.lz nixlib-7be0e37ca2dc8fa6b079baa6e272e3decb011b76.tar.xz nixlib-7be0e37ca2dc8fa6b079baa6e272e3decb011b76.tar.zst nixlib-7be0e37ca2dc8fa6b079baa6e272e3decb011b76.zip |
Merge master into test-1515
To get rid of 2k aborted builds. ?compare=1095725
Diffstat (limited to 'pkgs/development/interpreters')
-rw-r--r-- | pkgs/development/interpreters/luajit/default.nix | 45 |
1 files changed, 24 insertions, 21 deletions
diff --git a/pkgs/development/interpreters/luajit/default.nix b/pkgs/development/interpreters/luajit/default.nix index f74ad18d5e41..46c0b49c3b89 100644 --- a/pkgs/development/interpreters/luajit/default.nix +++ b/pkgs/development/interpreters/luajit/default.nix @@ -1,28 +1,31 @@ { stdenv, fetchurl }: -stdenv.mkDerivation rec{ - version = "2.0.2"; - name = "LuaJIT-${version}"; +stdenv.mkDerivation rec { + name = "luajit-${version}"; + version = "2.0.3"; - src = fetchurl { - url="http://luajit.org/download/${name}.tar.gz"; - sha256="0f3cykihfdn3gi6na9p0xjd4jnv26z18m441n5vyg42q9abh4ln0"; - }; + src = fetchurl { + url = "http://luajit.org/download/LuaJIT-${version}.tar.gz"; + sha256 = "0ydxpqkmsn2c341j4r2v6r5r0ig3kbwv3i9jran3iv81s6r6rgjm"; + }; - patchPhase = stdenv.lib.optionalString (stdenv.gcc.libc != null) - '' - substituteInPlace Makefile \ - --replace ldconfig ${stdenv.gcc.libc}/sbin/ldconfig - ''; + enableParallelBuilding = true; - installPhase = '' - make install PREFIX=$out - ''; + patchPhase = stdenv.lib.optionalString (stdenv.gcc.libc != null) + '' + substituteInPlace Makefile \ + --replace ldconfig ${stdenv.gcc.libc}/sbin/ldconfig + ''; - meta = { - description= "Just-in-time compiler and interpreter for lua 5.1."; - homepage = http://luajit.org; - license = stdenv.lib.licenses.mit; - platorms = stdenv.lib.platforms.linux; - }; + configurePhase = false; + buildFlags = [ "amalg" ]; # Build highly optimized version + installPhase = "make install PREFIX=$out"; + + meta = { + description = "high-performance JIT compiler for Lua 5.1"; + homepage = http://luajit.org; + license = stdenv.lib.licenses.mit; + platforms = stdenv.lib.platforms.linux; + maintainers = [ stdenv.lib.maintainers.thoughtpolice ]; + }; } |