luaffi: remove in favor of luaPackages.luaffi
This commit is contained in:
parent
fce7cfc2a5
commit
e9b136e400
4 changed files with 0 additions and 63 deletions
|
@ -1,17 +0,0 @@
|
|||
diff --git a/Makefile b/Makefile
|
||||
index b2b5f2c..b690a5d 100644
|
||||
--- a/Makefile
|
||||
+++ b/Makefile
|
||||
@@ -18,10 +18,10 @@ test:
|
||||
if [ `uname` = "Darwin" ]; then $(MAKE) test_macosx; else $(MAKE) test_posix; fi
|
||||
|
||||
macosx:
|
||||
- $(MAKE) posix "SOCC=MACOSX_DEPLOYMENT_TARGET=10.3 $(CC) -dynamiclib -single_module -undefined dynamic_lookup $(SOCFLAGS)"
|
||||
+ $(MAKE) posix "SOCC= $(CC) -dynamiclib -single_module -undefined dynamic_lookup -Wl,-install_name,$(PREFIX)/lib/$(MODSO) $(SOCFLAGS)"
|
||||
|
||||
test_macosx:
|
||||
- $(MAKE) test_posix "SOCC=MACOSX_DEPLOYMENT_TARGET=10.3 $(CC) -dynamiclib -single_module -undefined dynamic_lookup $(SOCFLAGS)"
|
||||
+ $(MAKE) test_posix "SOCC= $(CC) -dynamiclib -single_module -undefined dynamic_lookup -Wl,-install_name,$(PREFIX)/lib/$(MODSO) $(SOCFLAGS)"
|
||||
|
||||
posix: $(MODSO) test_cdecl.so
|
||||
|
|
@ -1,31 +0,0 @@
|
|||
{ stdenv, fetchFromGitHub, lua, pkgconfig }:
|
||||
|
||||
stdenv.mkDerivation {
|
||||
name = "luaffi-2013-11-08";
|
||||
src = fetchFromGitHub {
|
||||
owner = "jmckaskill";
|
||||
repo = "luaffi";
|
||||
rev = "abc638c9341025580099dcf77795c4b320ba0e63";
|
||||
sha256 = "1hv1y9i66p473hfy36nqj220sfrxdmbd75c1gpjvpk8073vx55ac";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ pkgconfig ];
|
||||
buildInputs = [ lua ];
|
||||
|
||||
patches = [ ./darwin.patch ./makefile-errors.patch ];
|
||||
|
||||
makeFlags = [ "PREFIX=$(out)" ];
|
||||
|
||||
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;
|
||||
};
|
||||
}
|
|
@ -1,13 +0,0 @@
|
|||
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
|
|
@ -12561,8 +12561,6 @@ in
|
|||
|
||||
luabind_luajit = luabind.override { lua = luajit; };
|
||||
|
||||
luaffi = callPackage ../development/libraries/luaffi { lua = lua5_1; };
|
||||
|
||||
lzo = callPackage ../development/libraries/lzo { };
|
||||
|
||||
mapnik = callPackage ../development/libraries/mapnik { };
|
||||
|
|
Loading…
Reference in a new issue