diff options
| author | Oliver Charles <ollie@ocharles.org.uk> | 2014-07-01 08:47:39 +0100 |
|---|---|---|
| committer | Oliver Charles <ollie@ocharles.org.uk> | 2014-07-01 08:47:39 +0100 |
| commit | 2480f2465c80debb507997df576218633cd76a02 (patch) | |
| tree | 6596f4e40e6dd05241f7ec0c928402cce16b11a0 /pkgs | |
| parent | 3471744cbb890ae6e8dcd494d218d8767524ca6c (diff) | |
| parent | 7987cd2cc1d80cc2ce146a77b302e8245ec342d9 (diff) | |
| download | nixlib-2480f2465c80debb507997df576218633cd76a02.tar nixlib-2480f2465c80debb507997df576218633cd76a02.tar.gz nixlib-2480f2465c80debb507997df576218633cd76a02.tar.bz2 nixlib-2480f2465c80debb507997df576218633cd76a02.tar.lz nixlib-2480f2465c80debb507997df576218633cd76a02.tar.xz nixlib-2480f2465c80debb507997df576218633cd76a02.tar.zst nixlib-2480f2465c80debb507997df576218633cd76a02.zip | |
Merge pull request #3138 from flosse/lua5-expat
added luaexpat 1.3.0
Diffstat (limited to 'pkgs')
| -rw-r--r-- | pkgs/development/interpreters/lua-5/expat.nix | 26 | ||||
| -rw-r--r-- | pkgs/top-level/all-packages.nix | 1 |
2 files changed, 27 insertions, 0 deletions
diff --git a/pkgs/development/interpreters/lua-5/expat.nix b/pkgs/development/interpreters/lua-5/expat.nix new file mode 100644 index 000000000000..a2b42cb37c53 --- /dev/null +++ b/pkgs/development/interpreters/lua-5/expat.nix @@ -0,0 +1,26 @@ +{ stdenv, fetchurl, lua5, expat }: + +stdenv.mkDerivation rec { + version = "1.3.0"; + name = "lua-expat-${version}"; + isLibrary = true; + src = fetchurl { + url = "https://matthewwild.co.uk/projects/luaexpat/luaexpat-${version}.tar.gz"; + sha256 = "1hvxqngn0wf5642i5p3vcyhg3pmp102k63s9ry4jqyyqc1wkjq6h"; + }; + + buildInputs = [ lua5 expat ]; + + preBuild = '' + makeFlagsArray=( + LUA_LDIR="$out/share/lua/${lua5.luaversion}" + LUA_INC="-I${lua5}/include" LUA_CDIR="$out/lib/lua/${lua5.luaversion}" + EXPAT_INC="-I${expat}/include"); + ''; + + meta = { + homepage = "http://matthewwild.co.uk/projects/luaexpat"; + platforms = stdenv.lib.platforms.linux; + maintainers = [ stdenv.lib.maintainers.flosse ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index dcd23c172cf6..eb2411c0686c 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -3464,6 +3464,7 @@ let lua5 = lua5_1; lua5_sockets = callPackage ../development/interpreters/lua-5/sockets.nix {}; + lua5_expat = callPackage ../development/interpreters/lua-5/expat.nix {}; luarocks = callPackage ../development/tools/misc/luarocks { lua = lua5; |