diff options
| author | Michael Raskin <7c6f434c@mail.ru> | 2015-04-04 21:25:42 +0300 |
|---|---|---|
| committer | Michael Raskin <7c6f434c@mail.ru> | 2015-04-04 21:25:42 +0300 |
| commit | f6d490c6e65d4961f2670f34e03034909ef8f9ba (patch) | |
| tree | c0fbeaee0574e65c6225d2346a1b3bf5eefe7afc /pkgs | |
| parent | 1ec78db3c66b0c28e47220821aedbc5a67ed782e (diff) | |
| parent | 9fbd1fdccce44ce8c363a9d7a6b4bd52d23cf957 (diff) | |
| download | nixlib-f6d490c6e65d4961f2670f34e03034909ef8f9ba.tar nixlib-f6d490c6e65d4961f2670f34e03034909ef8f9ba.tar.gz nixlib-f6d490c6e65d4961f2670f34e03034909ef8f9ba.tar.bz2 nixlib-f6d490c6e65d4961f2670f34e03034909ef8f9ba.tar.lz nixlib-f6d490c6e65d4961f2670f34e03034909ef8f9ba.tar.xz nixlib-f6d490c6e65d4961f2670f34e03034909ef8f9ba.tar.zst nixlib-f6d490c6e65d4961f2670f34e03034909ef8f9ba.zip | |
Merge pull request #6269 from maun/lua_lpeg
Fix lua lpeg on OSX
Diffstat (limited to 'pkgs')
| -rw-r--r-- | pkgs/top-level/lua-packages.nix | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/pkgs/top-level/lua-packages.nix b/pkgs/top-level/lua-packages.nix index 3ed9123a3ac5..ce75904418da 100644 --- a/pkgs/top-level/lua-packages.nix +++ b/pkgs/top-level/lua-packages.nix @@ -282,6 +282,12 @@ let }; buildInputs = [ unzip ]; + preBuild = '' + makeFlagsArray=(CC=$CC); + ''; + + buildFlags = if stdenv.isDarwin then "macosx" else ""; + installPhase = '' mkdir -p $out/lib/lua/${lua.luaversion} install -p lpeg.so $out/lib/lua/${lua.luaversion} @@ -290,7 +296,7 @@ let meta = { homepage = "http://www.inf.puc-rio.br/~roberto/lpeg/"; - hydraPlatforms = stdenv.lib.platforms.linux; + hydraPlatforms = stdenv.lib.platforms.all; license = stdenv.lib.licenses.mit; }; }; |