summary refs log tree commit diff
diff options
context:
space:
mode:
authorMarkus Kohlhase <mail@markus-kohlhase.de>2014-06-30 00:38:05 +0200
committerMarkus Kohlhase <mail@markus-kohlhase.de>2014-06-30 00:38:05 +0200
commit7987cd2cc1d80cc2ce146a77b302e8245ec342d9 (patch)
tree578b6d4641deec8a5eb76b1384bb5a42ece9cf61
parent54586a77e7c1feb331dc84e959396751f56315a7 (diff)
downloadnixlib-7987cd2cc1d80cc2ce146a77b302e8245ec342d9.tar
nixlib-7987cd2cc1d80cc2ce146a77b302e8245ec342d9.tar.gz
nixlib-7987cd2cc1d80cc2ce146a77b302e8245ec342d9.tar.bz2
nixlib-7987cd2cc1d80cc2ce146a77b302e8245ec342d9.tar.lz
nixlib-7987cd2cc1d80cc2ce146a77b302e8245ec342d9.tar.xz
nixlib-7987cd2cc1d80cc2ce146a77b302e8245ec342d9.tar.zst
nixlib-7987cd2cc1d80cc2ce146a77b302e8245ec342d9.zip
added luaexpat 1.3.0
-rw-r--r--lib/maintainers.nix1
-rw-r--r--pkgs/development/interpreters/lua-5/expat.nix26
-rw-r--r--pkgs/top-level/all-packages.nix1
3 files changed, 28 insertions, 0 deletions
diff --git a/lib/maintainers.nix b/lib/maintainers.nix
index fae54c3d9c92..f2fe38e8e56c 100644
--- a/lib/maintainers.nix
+++ b/lib/maintainers.nix
@@ -38,6 +38,7 @@
   emery = "Emery Hemingway <emery@vfemail.net>";
   ertes = "Ertugrul Söylemez <ertesx@gmx.de>";
   falsifian = "James Cook <james.cook@utoronto.ca>";
+  flosse = "Markus Kohlhase <mail@markus-kohlhase.de>";
   fuuzetsu = "Mateusz Kowalczyk <fuuzetsu@fuuzetsu.co.uk>";
   garbas = "Rok Garbas <rok@garbas.si>";
   goibhniu = "Cillian de Róiste <cillian.deroiste@gmail.com>";
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 cfb4ac4ba823..57a331350995 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -3453,6 +3453,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;