diff options
| author | Michael Raskin <7c6f434c@mail.ru> | 2019-08-20 08:13:33 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-08-20 08:13:33 +0000 |
| commit | d38d6aba1f1ff5508f11a6fb1dfcb094308cbad4 (patch) | |
| tree | 7df05b3cdb6971cf67fd0c4e115a6dd2c1359556 /pkgs/development/interpreters | |
| parent | 0cbeac4f661ed2e639611abf72240da1ba3a5d1d (diff) | |
| parent | 68847aeef420cf6a65f2697c1d3b961143d84cb2 (diff) | |
| download | nixlib-d38d6aba1f1ff5508f11a6fb1dfcb094308cbad4.tar nixlib-d38d6aba1f1ff5508f11a6fb1dfcb094308cbad4.tar.gz nixlib-d38d6aba1f1ff5508f11a6fb1dfcb094308cbad4.tar.bz2 nixlib-d38d6aba1f1ff5508f11a6fb1dfcb094308cbad4.tar.lz nixlib-d38d6aba1f1ff5508f11a6fb1dfcb094308cbad4.tar.xz nixlib-d38d6aba1f1ff5508f11a6fb1dfcb094308cbad4.tar.zst nixlib-d38d6aba1f1ff5508f11a6fb1dfcb094308cbad4.zip | |
Merge pull request #66883 from kisik21/lua-cross-compile-fix
lua: fix cross-compilation; fixes #66742
Diffstat (limited to 'pkgs/development/interpreters')
| -rw-r--r-- | pkgs/development/interpreters/lua-5/interpreter.nix | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/pkgs/development/interpreters/lua-5/interpreter.nix b/pkgs/development/interpreters/lua-5/interpreter.nix index 26db917c9002..fb0021cb709a 100644 --- a/pkgs/development/interpreters/lua-5/interpreter.nix +++ b/pkgs/development/interpreters/lua-5/interpreter.nix @@ -40,14 +40,17 @@ self = stdenv.mkDerivation rec { "PLAT=macosx" ] else [ "PLAT=linux" - ]) + ]) ++ (if stdenv.buildPlatform != stdenv.hostPlatform then [ + "CC=${stdenv.hostPlatform.config}-gcc" + "RANLIB=${stdenv.hostPlatform.config}-ranlib" + ] else []) ; configurePhase = '' runHook preConfigure makeFlagsArray+=(CFLAGS="-DLUA_USE_LINUX -O2 -fPIC${if compat then " -DLUA_COMPAT_ALL" else ""}" ) - makeFlagsArray+=(${stdenv.lib.optionalString stdenv.isDarwin "CC=\"$CC\""}) + makeFlagsArray+=(${stdenv.lib.optionalString stdenv.isDarwin "CC=\"$CC\""}${stdenv.lib.optionalString (stdenv.buildPlatform != stdenv.hostPlatform) " 'AR=${stdenv.hostPlatform.config}-ar rcu'"}) installFlagsArray=( TO_BIN="lua luac" INSTALL_DATA='cp -d' \ TO_LIB="${if stdenv.isDarwin then "liblua.${version}.dylib" else "liblua.a liblua.so liblua.so.${luaversion} liblua.so.${version}"}" ) |