From f5dd3b71e80c6f1193ecac6524a38bce0b7808ca Mon Sep 17 00:00:00 2001 From: Maximilian Bosch Date: Thu, 31 Aug 2017 11:29:28 +0200 Subject: [PATCH] luaffi: init at 2013-11-08 --- pkgs/development/libraries/luaffi/default.nix | 30 +++++++++++++++++++ .../libraries/luaffi/makefile-errors.patch | 13 ++++++++ pkgs/top-level/all-packages.nix | 2 ++ 3 files changed, 45 insertions(+) create mode 100644 pkgs/development/libraries/luaffi/default.nix create mode 100644 pkgs/development/libraries/luaffi/makefile-errors.patch diff --git a/pkgs/development/libraries/luaffi/default.nix b/pkgs/development/libraries/luaffi/default.nix new file mode 100644 index 000000000000..38dfba4c462c --- /dev/null +++ b/pkgs/development/libraries/luaffi/default.nix @@ -0,0 +1,30 @@ +{ stdenv, fetchFromGitHub, lua, pkgconfig }: + +stdenv.mkDerivation { + name = "luaffi-2013-11-08"; + src = fetchFromGitHub { + owner = "jmckaskill"; + repo = "luaffi"; + rev = "abc638c9341025580099dcf77795c4b320ba0e63"; + sha256 = "1hv1y9i66p473hfy36nqj220sfrxdmbd75c1gpjvpk8073vx55ac"; + }; + + buildInputs = [ lua pkgconfig ]; + + patches = [ + ./makefile-errors.patch + ]; + + installPhase = '' + mkdir -p $out/lib + cp ffi.so $out/lib/ffi.so + ''; + + meta = with stdenv.lib; { + description = "Standalone FFI library for calling C functions from lua. Compatible with the luajit FFI interface."; + homepage = https://github.com/jmckaskill/luaffi; + maintainers = with maintainers; [ ma27 ]; + license = licenses.mit; + platforms = platforms.unix; + }; +} diff --git a/pkgs/development/libraries/luaffi/makefile-errors.patch b/pkgs/development/libraries/luaffi/makefile-errors.patch new file mode 100644 index 000000000000..0ee6e6390068 --- /dev/null +++ b/pkgs/development/libraries/luaffi/makefile-errors.patch @@ -0,0 +1,13 @@ +diff --git a/Makefile b/Makefile +index b2b5f2c..49d4c99 100644 +--- a/Makefile ++++ b/Makefile +@@ -6,7 +6,7 @@ LUA=lua + LUA_CFLAGS=`$(PKG_CONFIG) --cflags lua5.2 2>/dev/null || $(PKG_CONFIG) --cflags lua` + SOCFLAGS=-fPIC + SOCC=$(CC) -shared $(SOCFLAGS) +-CFLAGS=-fPIC -g -Wall -Werror $(LUA_CFLAGS) -fvisibility=hidden -Wno-unused-function --std=gnu99 ++CFLAGS=-fPIC -g -Wall $(LUA_CFLAGS) -fvisibility=hidden -Wno-unused-function --std=gnu99 + + MODNAME=ffi + MODSO=$(MODNAME).so diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 5d486de46873..b97715eb7067 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -9498,6 +9498,8 @@ with pkgs; luabind_luajit = callPackage ../development/libraries/luabind { lua = luajit; }; + luaffi = callPackage ../development/libraries/luaffi { lua = lua5_1; }; + lzo = callPackage ../development/libraries/lzo { }; mapnik = callPackage ../development/libraries/mapnik { };