diff options
author | wyvie <elijahrum@gmail.com> | 2014-09-18 11:09:43 +0400 |
---|---|---|
committer | Mateusz Kowalczyk <fuuzetsu@fuuzetsu.co.uk> | 2014-09-20 23:32:17 +0100 |
commit | 4d5336316caedbb8033646b3a69811f3f4c0fc29 (patch) | |
tree | 7b7f2a047469898de047ab1faf3b4cff378b6a0e /pkgs/development/interpreters/lua-5 | |
parent | 95c72a5f6056a5be64f627112d72ea39e9e85715 (diff) |
New package: lua-zip-1.2.3
Closes #4138
Diffstat (limited to 'pkgs/development/interpreters/lua-5')
-rw-r--r-- | pkgs/development/interpreters/lua-5/zip.nix | 28 | ||||
-rw-r--r-- | pkgs/development/interpreters/lua-5/zip.patch | 23 |
2 files changed, 51 insertions, 0 deletions
diff --git a/pkgs/development/interpreters/lua-5/zip.nix b/pkgs/development/interpreters/lua-5/zip.nix new file mode 100644 index 0000000000000..f6460be16625c --- /dev/null +++ b/pkgs/development/interpreters/lua-5/zip.nix @@ -0,0 +1,28 @@ +{ pkgs, stdenv, fetchurl, lua5_1, zziplib }: + +stdenv.mkDerivation rec { + version = "1.2.3"; + name = "lua-zip-${version}"; + isLibrary = true; + src = fetchurl { + url = "https://github.com/luaforge/luazip/archive/0b8f5c958e170b1b49f05bc267bc0351ad4dfc44.zip"; + sha256 = "beb9260d606fdd5304aa958d95f0d3c20be7ca0a2cff44e7b75281c138a76a50"; + }; + + buildInputs = [ pkgs.unzip lua5_1 zziplib ]; + + preBuild = '' + makeFlagsArray=( + PREFIX=$out + LUA_LIBDIR="$out/lib/lua/${lua5_1.luaversion}" + LUA_INC="-I${lua5_1}/include"); + ''; + + patches = [ ./zip.patch ]; + + meta = { + homepage = "https://github.com/luaforge/luazip"; + hydraPlatforms = stdenv.lib.platforms.linux; + license = stdenv.lib.licenses.mit; + }; +} diff --git a/pkgs/development/interpreters/lua-5/zip.patch b/pkgs/development/interpreters/lua-5/zip.patch new file mode 100644 index 0000000000000..c3f88f451e8db --- /dev/null +++ b/pkgs/development/interpreters/lua-5/zip.patch @@ -0,0 +1,23 @@ +--- a/Makefile 2007-10-30 01:59:10.000000000 +0300 ++++ b/Makefile 2014-09-18 11:04:53.176320021 +0400 +@@ -6,10 +6,6 @@ + + include $(CONFIG) + +-ifeq "$(LUA_VERSION_NUM)" "500" +-COMPAT_O= $(COMPAT_DIR)/compat-5.1.o +-endif +- + SRCS= src/lua$T.c + OBJS= src/lua$T.o $(COMPAT_O) + +@@ -19,9 +15,6 @@ + src/$(LIBNAME): $(OBJS) + export MACOSX_DEPLOYMENT_TARGET="10.3"; $(CC) $(CFLAGS) $(LIB_OPTION) -o src/$(LIBNAME) $(OBJS) -lzzip + +-$(COMPAT_DIR)/compat-5.1.o: $(COMPAT_DIR)/compat-5.1.c +- $(CC) -c $(CFLAGS) -o $@ $(COMPAT_DIR)/compat-5.1.c +- + install: src/$(LIBNAME) + mkdir -p $(LUA_LIBDIR) + cp src/$(LIBNAME) $(LUA_LIBDIR) |