diff options
| author | John Ericson <John.Ericson@Obsidian.Systems> | 2017-06-26 19:11:17 -0400 |
|---|---|---|
| committer | John Ericson <John.Ericson@Obsidian.Systems> | 2017-06-28 18:21:06 -0400 |
| commit | 5d1e51a199917fa945cb59567597e354c6e4f56d (patch) | |
| tree | c7194b458ac5b738cfd06587fccb28a55370370c /pkgs/development/interpreters/lua-5/5.3.nix | |
| parent | c3c5793ab29d3fe8b3c0faff2ad644cfe91618b9 (diff) | |
| download | nixlib-5d1e51a199917fa945cb59567597e354c6e4f56d.tar nixlib-5d1e51a199917fa945cb59567597e354c6e4f56d.tar.gz nixlib-5d1e51a199917fa945cb59567597e354c6e4f56d.tar.bz2 nixlib-5d1e51a199917fa945cb59567597e354c6e4f56d.tar.lz nixlib-5d1e51a199917fa945cb59567597e354c6e4f56d.tar.xz nixlib-5d1e51a199917fa945cb59567597e354c6e4f56d.tar.zst nixlib-5d1e51a199917fa945cb59567597e354c6e4f56d.zip | |
lua 5: Don't use stdenv.cross, and use less make flags
cc-wrapper will define environment variables matching those now
Diffstat (limited to 'pkgs/development/interpreters/lua-5/5.3.nix')
| -rw-r--r-- | pkgs/development/interpreters/lua-5/5.3.nix | 12 |
1 files changed, 4 insertions, 8 deletions
diff --git a/pkgs/development/interpreters/lua-5/5.3.nix b/pkgs/development/interpreters/lua-5/5.3.nix index a22e162b8e18..8290bd05c590 100644 --- a/pkgs/development/interpreters/lua-5/5.3.nix +++ b/pkgs/development/interpreters/lua-5/5.3.nix @@ -1,4 +1,6 @@ -{ stdenv, fetchurl, readline, compat ? false }: +{ stdenv, fetchurl, readline, compat ? false +, hostPlatform +}: stdenv.mkDerivation rec { name = "lua-${version}"; @@ -54,21 +56,15 @@ stdenv.mkDerivation rec { ''; crossAttrs = let - isMingw = stdenv.cross.libc == "msvcrt"; - isDarwin = stdenv.cross.libc == "libSystem"; + inherit (hostPlatform) isDarwin isMingw; in { configurePhase = '' makeFlagsArray=( INSTALL_TOP=$out INSTALL_MAN=$out/share/man/man1 - CC=${stdenv.cross.config}-gcc - STRIP=: - RANLIB=${stdenv.cross.config}-ranlib V=${luaversion} R=${version} ${if isMingw then "mingw" else stdenv.lib.optionalString isDarwin '' - AR="${stdenv.cross.config}-ar rcu" - macosx ''} ) '' + stdenv.lib.optionalString isMingw '' |