diff options
| author | Graham Christensen <graham@grahamc.com> | 2017-07-09 10:56:30 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-07-09 10:56:30 -0400 |
| commit | 26a69b1bbc46a4bc5179ca088609954add12f57a (patch) | |
| tree | 696572ceaf483ae750f0d2d7ae0d6c2c3a70d6f5 /pkgs/top-level | |
| parent | f2be840e985e73d19e43567bd0437ec9ab9025bb (diff) | |
| parent | 32dec43701673e25341d8575ba05dfd9d1ba0e5e (diff) | |
| download | nixlib-26a69b1bbc46a4bc5179ca088609954add12f57a.tar nixlib-26a69b1bbc46a4bc5179ca088609954add12f57a.tar.gz nixlib-26a69b1bbc46a4bc5179ca088609954add12f57a.tar.bz2 nixlib-26a69b1bbc46a4bc5179ca088609954add12f57a.tar.lz nixlib-26a69b1bbc46a4bc5179ca088609954add12f57a.tar.xz nixlib-26a69b1bbc46a4bc5179ca088609954add12f57a.tar.zst nixlib-26a69b1bbc46a4bc5179ca088609954add12f57a.zip | |
Merge pull request #27243 from richardipsum/richardipsum/fix-lrexlib
lrexlib: 2.7.2 (broken) -> 2.8.0
Diffstat (limited to 'pkgs/top-level')
| -rw-r--r-- | pkgs/top-level/lua-packages.nix | 14 |
1 files changed, 6 insertions, 8 deletions
diff --git a/pkgs/top-level/lua-packages.nix b/pkgs/top-level/lua-packages.nix index 71aef7544dd1..f33b397958ca 100644 --- a/pkgs/top-level/lua-packages.nix +++ b/pkgs/top-level/lua-packages.nix @@ -311,24 +311,23 @@ let lrexlib = buildLuaPackage rec { name = "lrexlib-${version}"; - version = "2.7.2"; + version = "2.8.0"; src = fetchzip { - url = "https://github.com/rrthomas/lrexlib/archive/150c251be57c4e569da0f48bf6b01fbca97179fe.zip"; - sha256 = "0acb3258681bjq61piz331r99bdff6cnkjaigq5phg3699iz5h75"; + url = "https://github.com/rrthomas/lrexlib/archive/rel-2-8-0.zip"; + sha256 = "1c62ny41b1ih6iddw5qn81gr6dqwfffzdp7q6m8x09zzcdz78zhr"; }; buildInputs = [ unzip luastdlib pcre luarocks oniguruma gnulib tre glibc ]; buildPhase = let - luaVariable = "LUA_PATH=${luastdlib}/share/lua/${lua.luaversion}/?.lua"; + luaVariable = ''LUA_PATH="${luastdlib}/share/lua/${lua.luaversion}/?/init.lua;${luastdlib}/share/lua/${lua.luaversion}/?.lua"''; - pcreVariable = "PCRE_DIR=${pcre.dev}"; + pcreVariable = "PCRE_DIR=${pcre.out} PCRE_INCDIR=${pcre.dev}/include"; onigVariable = "ONIG_DIR=${oniguruma}"; gnuVariable = "GNU_INCDIR=${gnulib}/lib"; treVariable = "TRE_DIR=${tre}"; posixVariable = "POSIX_DIR=${glibc.dev}"; in '' - sed -e 's@$(LUAROCKS) $(LUAROCKS_COMMAND) $$i;@$(LUAROCKS) $(LUAROCKS_COMMAND) $$i ${pcreVariable} ${onigVariable} ${gnuVariable} ${treVariable} ${posixVariable};@' \ - -i Makefile + sed -e 's@$(LUAROCKS) $(LUAROCKS_COMMAND) $$i;@$(LUAROCKS) $(LUAROCKS_COMMAND) $$i ${pcreVariable} ${onigVariable} ${gnuVariable} ${treVariable} ${posixVariable};@' -i Makefile ${luaVariable} make ''; @@ -341,7 +340,6 @@ let homepage = "https://github.com/lua-stdlib/lua-stdlib/"; platforms = stdenv.lib.platforms.linux; license = stdenv.lib.licenses.mit; - broken = true; }; }; |