From b13188dff065e7c947391f664a54506a332aa222 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Tue, 17 Sep 2013 11:45:55 +0200 Subject: [PATCH] lua-5.2: install missing liblua.so.5.2.2 binary --- pkgs/development/interpreters/lua-5/5.2.nix | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/pkgs/development/interpreters/lua-5/5.2.nix b/pkgs/development/interpreters/lua-5/5.2.nix index 0ae4fbe322ad..f8787dcc7f07 100644 --- a/pkgs/development/interpreters/lua-5/5.2.nix +++ b/pkgs/development/interpreters/lua-5/5.2.nix @@ -9,7 +9,8 @@ let in stdenv.mkDerivation rec { name = "lua-${version}"; - version = "5.2.2"; + majorVersion = "5.2"; + version = "${majorVersion}.2"; src = fetchurl { url = "http://www.lua.org/ftp/${name}.tar.gz"; @@ -21,14 +22,14 @@ stdenv.mkDerivation rec { patches = [ dsoPatch ]; configurePhase = '' - makeFlagsArray=( INSTALL_TOP=$out INSTALL_MAN=$out/share/man/man1 PLAT=linux CFLAGS="-O2 -fPIC" LDLAGS="-fPIC" ) - installFlagsArray=( TO_BIN="lua luac" TO_LIB="liblua.a liblua.so liblua.so.5.2" INSTALL_DATA='cp -d' ) + makeFlagsArray=( INSTALL_TOP=$out INSTALL_MAN=$out/share/man/man1 PLAT=linux CFLAGS="-O2 -fPIC" LDLAGS="-fPIC" V=${majorVersion} R=${version} ) + installFlagsArray=( TO_BIN="lua luac" TO_LIB="liblua.a liblua.so liblua.so.${majorVersion} liblua.so.${version}" INSTALL_DATA='cp -d' ) ''; postInstall = '' mkdir -p "$out/share/doc/lua" "$out/lib/pkgconfig" mv "doc/"*.{gif,png,css,html} "$out/share/doc/lua/" - rmdir $out/{share,lib}/lua/5.2 $out/{share,lib}/lua + rmdir $out/{share,lib}/lua/${majorVersion} $out/{share,lib}/lua mkdir -p "$out/lib/pkgconfig" cat >"$out/lib/pkgconfig/lua.pc" <