diff options
| author | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2014-09-08 11:49:44 +0200 |
|---|---|---|
| committer | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2014-09-08 13:10:13 +0200 |
| commit | af69fcde47774876588fbf61179ca0e55fa69eac (patch) | |
| tree | 5cce3737325d6fde9dfb7820dca9a71a62c1e779 /pkgs/development/interpreters | |
| parent | 5e3eff3bbd9897e7f695dcbec0f1b84a21d6cba2 (diff) | |
| download | nixpkgs-af69fcde47774876588fbf61179ca0e55fa69eac.tar nixpkgs-af69fcde47774876588fbf61179ca0e55fa69eac.tar.gz nixpkgs-af69fcde47774876588fbf61179ca0e55fa69eac.tar.bz2 nixpkgs-af69fcde47774876588fbf61179ca0e55fa69eac.tar.lz nixpkgs-af69fcde47774876588fbf61179ca0e55fa69eac.tar.xz nixpkgs-af69fcde47774876588fbf61179ca0e55fa69eac.tar.zst nixpkgs-af69fcde47774876588fbf61179ca0e55fa69eac.zip | |
Fix Nixpkgs evaluation
error: attribute `luaversion' missing, at /home/eelco/Dev/nixpkgs/pkgs/development/interpreters/lua-5/expat.nix:16:34
Diffstat (limited to 'pkgs/development/interpreters')
| -rw-r--r-- | pkgs/development/interpreters/lua-5/5.2.nix | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/pkgs/development/interpreters/lua-5/5.2.nix b/pkgs/development/interpreters/lua-5/5.2.nix index 1839e7789a8..1812ccbf7d6 100644 --- a/pkgs/development/interpreters/lua-5/5.2.nix +++ b/pkgs/development/interpreters/lua-5/5.2.nix @@ -9,8 +9,8 @@ let in stdenv.mkDerivation rec { name = "lua-${version}"; - majorVersion = "5.2"; - version = "${majorVersion}.3"; + luaversion = "5.2"; + version = "${luaversion}.3"; src = fetchurl { url = "http://www.lua.org/ftp/${name}.tar.gz"; @@ -24,17 +24,17 @@ stdenv.mkDerivation rec { configurePhase = if stdenv.isDarwin then '' - makeFlagsArray=( INSTALL_TOP=$out INSTALL_MAN=$out/share/man/man1 PLAT=macosx CFLAGS="-DLUA_USE_LINUX -fno-common -O2 -fPIC${if compat then " -DLUA_COMPAT_ALL" else ""}" LDFLAGS="-fPIC" V=${majorVersion} R=${version} ) + makeFlagsArray=( INSTALL_TOP=$out INSTALL_MAN=$out/share/man/man1 PLAT=macosx CFLAGS="-DLUA_USE_LINUX -fno-common -O2 -fPIC${if compat then " -DLUA_COMPAT_ALL" else ""}" LDFLAGS="-fPIC" V=${luaversion} R=${version} ) installFlagsArray=( TO_BIN="lua luac" TO_LIB="liblua.${version}.dylib" INSTALL_DATA='cp -d' ) '' else '' - makeFlagsArray=( INSTALL_TOP=$out INSTALL_MAN=$out/share/man/man1 PLAT=linux CFLAGS="-DLUA_USE_LINUX -O2 -fPIC${if compat then " -DLUA_COMPAT_ALL" else ""}" LDFLAGS="-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' ) + makeFlagsArray=( INSTALL_TOP=$out INSTALL_MAN=$out/share/man/man1 PLAT=linux CFLAGS="-DLUA_USE_LINUX -O2 -fPIC${if compat then " -DLUA_COMPAT_ALL" else ""}" LDFLAGS="-fPIC" V=${luaversion} R=${version} ) + installFlagsArray=( TO_BIN="lua luac" TO_LIB="liblua.a liblua.so liblua.so.${luaversion} 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/${majorVersion} $out/{share,lib}/lua + rmdir $out/{share,lib}/lua/${luaversion} $out/{share,lib}/lua mkdir -p "$out/lib/pkgconfig" cat >"$out/lib/pkgconfig/lua.pc" <<EOF prefix=$out @@ -65,7 +65,7 @@ stdenv.mkDerivation rec { CC=${stdenv.cross.config}-gcc STRIP=: RANLIB=${stdenv.cross.config}-ranlib - V=${majorVersion} + V=${luaversion} R=${version} ${if isMingw then "mingw" else stdenv.lib.optionalString isDarwin '' AR="${stdenv.cross.config}-ar rcu" |