Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

lrexlib: 2.7.2 (broken) -> 2.8.0 #27243

Merged
merged 1 commit into from
Jul 9, 2017

Conversation

richardipsum
Copy link
Contributor

Hello,

This fixes a previously broken package. The package now builds for both lua5.1 and lua5.2 on GNU/Linux. I have checked the resulting output for the presence of the expected shared objects, the rex_pcre.so object is missing, but that looks to be due to a possibly broken pcre package.

Hope this helps,
Richard Ipsum

@mention-bot
Copy link

@richardipsum, thanks for your PR! By analyzing the history of the files in this pull request, we identified @Wyvie, @vcunat and @k0ral to be potential reviewers.

};
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\"";
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Using double single quotes (see nix syntax) would allow you to get rid of the escaping business, which is distracting.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

wow, thanks for such a speedy review, will swap for double single quotes now 😸

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@richardipsum Don't get your hopes up; my opinion does not matter in this project, since I am only a "Contributor".

Thanks for your contribution.

Copy link
Contributor

@0xABAB 0xABAB left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

If my comment has been taken into account, this is ready.

@richardipsum richardipsum force-pushed the richardipsum/fix-lrexlib branch from 6f7ff4c to 945c02a Compare July 8, 2017 19:48
};
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}";
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The reason this isn't building the rex_pcre.so seems to be due to this depending on pcre.dev, which doesn't contain the lib needed, I will rework this.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yeah, this needs to use both pcre.dev for the header files, and pcre.out for the shared object, I'll push this fix shortly.

The shared objects are not available in 'pcre.dev', so to build the rex_pcre.so
file we must specify 'pcre.out' as the directory to obtain shared objects
from, 'pcre.dev' is still needed for the header files though.
@richardipsum richardipsum force-pushed the richardipsum/fix-lrexlib branch from 945c02a to 32dec43 Compare July 8, 2017 22:11
@0xABAB
Copy link
Contributor

0xABAB commented Jul 9, 2017

@7c6f434c Please merge.

@grahamc grahamc merged commit 26a69b1 into NixOS:master Jul 9, 2017
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

4 participants