From 0946e304705414dd9f01e01f792293338fd37caf Mon Sep 17 00:00:00 2001 From: xd1le Date: Fri, 13 Oct 2017 14:46:51 +1100 Subject: [PATCH] luaPackages: use consistent multiline strings for luafilsystem and luazlib --- pkgs/top-level/lua-packages.nix | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/pkgs/top-level/lua-packages.nix b/pkgs/top-level/lua-packages.nix index 9bbb5a7c0c0..e4f18258aff 100644 --- a/pkgs/top-level/lua-packages.nix +++ b/pkgs/top-level/lua-packages.nix @@ -169,7 +169,10 @@ let url = "https://github.com/keplerproject/luafilesystem/archive/v1_6_2.tar.gz"; sha256 = "134azkxw84xp9g5qmzjsmcva629jm7plwcmjxkdzdg05vyd7kig1"; }; - preConfigure = "substituteInPlace config --replace 'CC= gcc' '';" + + preConfigure = '' + substituteInPlace config --replace "CC= gcc" ""; + '' + stdenv.lib.optionalString stdenv.isDarwin '' substituteInPlace config \ --replace 'LIB_OPTION= -shared' '###' \ @@ -357,7 +360,9 @@ let buildInputs = [ zlib ]; - preConfigure = "substituteInPlace Makefile --replace gcc cc --replace '-llua' ''"; + preConfigure = '' + substituteInPlace Makefile --replace gcc cc --replace "-llua" "" + ''; preBuild = '' makeFlagsArray=(