diff options
| author | xd1le <elisp.vim@gmail.com> | 2017-10-01 00:36:10 +1000 |
|---|---|---|
| committer | xd1le <elisp.vim@gmail.com> | 2017-10-10 02:51:05 +1100 |
| commit | df5691d6770e2a8b2955ed0da2d48a01b00e4eaa (patch) | |
| tree | 815db84a88c2ebd87552fd7fa2b0f841c1124fab /pkgs/development/lua-modules | |
| parent | 2c21f3deeb15f409cb65da4c2bb1f47c03e4d38e (diff) | |
| download | nixpkgs-df5691d6770e2a8b2955ed0da2d48a01b00e4eaa.tar nixpkgs-df5691d6770e2a8b2955ed0da2d48a01b00e4eaa.tar.gz nixpkgs-df5691d6770e2a8b2955ed0da2d48a01b00e4eaa.tar.bz2 nixpkgs-df5691d6770e2a8b2955ed0da2d48a01b00e4eaa.tar.lz nixpkgs-df5691d6770e2a8b2955ed0da2d48a01b00e4eaa.tar.xz nixpkgs-df5691d6770e2a8b2955ed0da2d48a01b00e4eaa.tar.zst nixpkgs-df5691d6770e2a8b2955ed0da2d48a01b00e4eaa.zip | |
buildLuaPackage: set makeFlags directly instead of through preBuild
So that lua packages can override it without having to resort to setting makeFlagsArray in preBuild.
Diffstat (limited to 'pkgs/development/lua-modules')
| -rw-r--r-- | pkgs/development/lua-modules/generic/default.nix | 15 |
1 files changed, 7 insertions, 8 deletions
diff --git a/pkgs/development/lua-modules/generic/default.nix b/pkgs/development/lua-modules/generic/default.nix index 2a44cdfca0b..7152d0b9e36 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 |