JakeHillion/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

luajit: 2.1.0-beta2 -> 2.1.0-beta3

Browse Source 
The removal of `luaL_reg` alias caused lots of breakage.
Only sysdig and knot-resolver needed (also) other changes.
This commit is contained in:
Vladimír Čunát 2017-05-02 13:47:36 +02:00
parent 9ad1aaae53
commit d7501b986a
No known key found for this signature in database
GPG Key ID: E747DF1F9575A3AA
8 changed files with 25 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pkgs/desktops/enlightenment/efl.nix
View File

@ -61,6 +61,8 @@ stdenv.mkDerivation rec {
source "$setupHook"
'';
NIX_CFLAGS_COMPILE = [ "-DluaL_reg=luaL_Reg" ]; # needed since luajit-2.1.0-beta3
postInstall = ''
substituteInPlace "$out/share/elua/core/util.lua" --replace '$out' "$out"
modules=$(for i in "$out/include/"*/; do printf ' -I''${includedir}/'`basename $i`; done)

2
pkgs/development/interpreters/love/0.10.nix
View File

@ -28,6 +28,8 @@ stdenv.mkDerivation rec {
"--with-lua=luajit"
];
NIX_CFLAGS_COMPILE = [ "-DluaL_reg=luaL_Reg" ]; # needed since luajit-2.1.0-beta3
meta = {
homepage = "http://love2d.org";
description = "A Lua-based 2D game engine/scripting language";

2
pkgs/development/interpreters/love/0.9.nix
View File

@ -20,6 +20,8 @@ stdenv.mkDerivation rec {
"--with-lua=luajit"
];
NIX_CFLAGS_COMPILE = [ "-DluaL_reg=luaL_Reg" ]; # needed since luajit-2.1.0-beta3
meta = {
homepage = "http://love2d.org";
description = "A Lua-based 2D game engine/scripting language";

4
pkgs/development/interpreters/luajit/default.nix
View File

@ -2,12 +2,12 @@
stdenv.mkDerivation rec {
name = "luajit-${version}";
version = "2.1.0-beta2";
version = "2.1.0-beta3";
luaversion = "5.1";
src = fetchurl {
url = "http://luajit.org/download/LuaJIT-${version}.tar.gz";
sha256 = "0iyghj1xjlmd9ywa4flf9yszynf3jhbp0yqb9b49k7ab0g528fbi";
sha256 = "1hyrhpkwjqsv54hnnx4cl8vk44h9d6c9w0fz1jfjz00w255y7lhs";
};
enableParallelBuilding = true;

2
pkgs/games/minetest/default.nix
View File

@ -33,6 +33,8 @@ in stdenv.mkDerivation {
"-DIRRLICHT_INCLUDE_DIR=${irrlicht}/include/irrlicht"
];
NIX_CFLAGS_COMPILE = [ "-DluaL_reg=luaL_Reg" ]; # needed since luajit-2.1.0-beta3
buildInputs = [
cmake irrlicht libpng bzip2 libjpeg curl libogg jsoncpp libXxf86vm mesa
openal libvorbis xlibsWrapper sqlite luajit freetype gettext doxygen ncurses

6
pkgs/os-specific/linux/sysdig/default.nix
View File

@ -25,6 +25,12 @@ stdenv.mkDerivation rec {
"-DSYSDIG_VERSION=${version}"
] ++ optional (kernel == null) "-DBUILD_DRIVER=OFF";
# needed since luajit-2.1.0-beta3
NIX_CFLAGS_COMPILE = [
"-DluaL_reg=luaL_Reg"
"-DluaL_getn(L,i)=((int)lua_objlen(L,i))"
];
preConfigure = ''
export INSTALL_MOD_PATH="$out"
'' + optionalString (kernel != null) ''

8
pkgs/servers/dns/knot-resolver/default.nix
View File

@ -1,4 +1,4 @@
{ stdenv, fetchurl, pkgconfig, utillinux, hexdump, which
{ stdenv, fetchurl, fetchpatch, pkgconfig, utillinux, hexdump, which
, knot-dns, luajit, libuv, lmdb
, cmocka, systemd, hiredis, libmemcached
, gnutls, nettle
@ -17,6 +17,12 @@ stdenv.mkDerivation rec {
sha256 = "31e1b8899c5592433e5265a8e9685126fc5aeff3bd6b10884154b2e34b786f3c";
};
patches = [(fetchpatch {
name = "luajit-2.1.0-beta3.diff";
url = https://gitlab.labs.nic.cz/knot/resolver/merge_requests/289.diff;
sha256 = "1cgfi715qhmvb31ri2wr6cacsjvb1dqavdmnnl1074y25zalxfax";
})];
outputs = [ "out" "dev" ];
configurePhase = ":";

2
pkgs/tools/networking/wrk/default.nix
View File

@ -22,6 +22,8 @@ stdenv.mkDerivation rec {
done
'';
NIX_CFLAGS_COMPILE = [ "-DluaL_reg=luaL_Reg" ]; # needed since luajit-2.1.0-beta3
installPhase = ''
mkdir -p $out/bin
cp wrk $out/bin