From 50d2b3ca1159f848d4cd47452e7738fc1ba3ade5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= Date: Sat, 17 Sep 2016 13:10:01 +0200 Subject: [PATCH] luasocket: fix non-5.1 builds LUAV has to be set accordingly for make, otherwise it will install files default to the 5.1 path. --- pkgs/top-level/lua-packages.nix | 18 +++++++++++------- 1 file changed, 11 insertions(+), 7 deletions(-) diff --git a/pkgs/top-level/lua-packages.nix b/pkgs/top-level/lua-packages.nix index 83499fa32184..ce087152686a 100644 --- a/pkgs/top-level/lua-packages.nix +++ b/pkgs/top-level/lua-packages.nix @@ -189,16 +189,20 @@ let sha256 = "0j8jx8bjicvp9khs26xjya8c495wrpb7parxfnabdqa5nnsxjrwb"; }; - patchPhase = '' - sed -e "s,^LUAPREFIX_linux.*,LUAPREFIX_linux=$out," \ - -i src/makefile - '' + stdenv.lib.optionalString stdenv.isDarwin '' - export PLAT=macosx - export LUAPREFIX_macosx=$out - substituteInPlace src/Makefile --replace gcc cc \ + patchPhase = stdenv.lib.optionalString stdenv.isDarwin '' + substituteInPlace src/makefile --replace gcc cc \ --replace 10.3 10.5 ''; + preBuild = '' + makeFlagsArray=( + LUAV=${lua.luaversion} + PLAT=${if stdenv.isDarwin then "macosx" else "linux"} + LUAPREFIX_linux=$out + LUAPREFIX_macosx=$out + ); + ''; + meta = { homepage = "http://w3.impa.br/~diego/software/luasocket/"; hydraPlatforms = stdenv.lib.platforms.linux;