From df5691d6770e2a8b2955ed0da2d48a01b00e4eaa Mon Sep 17 00:00:00 2001 From: xd1le Date: Sun, 1 Oct 2017 00:36:10 +1000 Subject: [PATCH] buildLuaPackage: set makeFlags directly instead of through preBuild So that lua packages can override it without having to resort to setting makeFlagsArray in preBuild. --- pkgs/development/lua-modules/generic/default.nix | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) diff --git a/pkgs/development/lua-modules/generic/default.nix b/pkgs/development/lua-modules/generic/default.nix index 2a44cdfca0b0..7152d0b9e360 100644 --- a/pkgs/development/lua-modules/generic/default.nix +++ b/pkgs/development/lua-modules/generic/default.nix @@ -5,14 +5,13 @@ lua: if disabled then throw "${attrs.name} not supported by interpreter lua-${lua.luaversion}" else - lua.stdenv.mkDerivation ({ - - preBuild = '' - makeFlagsArray=( - PREFIX=$out - LUA_LIBDIR="$out/lib/lua/${lua.luaversion}" - LUA_INC="-I${lua}/include"); - ''; + lua.stdenv.mkDerivation ( + { + makeFlags = [ + "PREFIX=$(out)" + "LUA_LIBDIR=$(out)/lib/lua/${lua.luaversion}" + "LUA_INC=-I${lua}/include" + ]; } // attrs