diff options
| author | Daiderd Jordan <daiderd@gmail.com> | 2017-11-20 23:44:47 +0100 |
|---|---|---|
| committer | Orivej Desh <orivej@gmx.fr> | 2017-11-29 03:01:15 +0000 |
| commit | b7ed08665039128c24c772ba41431f24d8bbfc37 (patch) | |
| tree | aa0f9beb14545ea450baba9725045f248b63a684 /pkgs/top-level/lua-packages.nix | |
| parent | 00ced68a9e1223dad4b8c035a65f87721693a532 (diff) | |
| download | nixpkgs-b7ed08665039128c24c772ba41431f24d8bbfc37.tar nixpkgs-b7ed08665039128c24c772ba41431f24d8bbfc37.tar.gz nixpkgs-b7ed08665039128c24c772ba41431f24d8bbfc37.tar.bz2 nixpkgs-b7ed08665039128c24c772ba41431f24d8bbfc37.tar.lz nixpkgs-b7ed08665039128c24c772ba41431f24d8bbfc37.tar.xz nixpkgs-b7ed08665039128c24c772ba41431f24d8bbfc37.tar.zst nixpkgs-b7ed08665039128c24c772ba41431f24d8bbfc37.zip | |
lua-mpack: fix darwin build
Diffstat (limited to 'pkgs/top-level/lua-packages.nix')
| -rw-r--r-- | pkgs/top-level/lua-packages.nix | 22 |
1 files changed, 9 insertions, 13 deletions
diff --git a/pkgs/top-level/lua-packages.nix b/pkgs/top-level/lua-packages.nix index e3eaa7c7f58..47299791e86 100644 --- a/pkgs/top-level/lua-packages.nix +++ b/pkgs/top-level/lua-packages.nix @@ -614,34 +614,30 @@ let }; mpack = buildLuaPackage rec { - name = "lua-mpack-${version}"; - version = "1.0.7_${rev}"; - rev = "ef025224a799066b818120fb1f30a308543a6e99"; + name = "mpack-${version}"; + version = "1.0.7"; src = fetchFromGitHub { owner = "libmpack"; repo = "libmpack-lua"; - inherit rev; + rev = version; sha256 = "1nydi6xbmxwl1fmi32v5v8n74msnmzblzqaqnb102w6vkinampsb"; }; nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ libmpack ]; # ++ [ libtool lua ]; + buildInputs = [ libmpack ]; dontBuild = true; - preInstall = '' - mkdir -p $out/lib/lua/${lua.luaversion} - export PKG_CONFIG_PATH=$PKG_CONFIG_PATH:${libmpack} + postPatch = stdenv.lib.optionalString stdenv.isDarwin '' + substituteInPlace Makefile \ + --replace '-shared' '-bundle -undefined dynamic_lookup -all_load' ''; - NIX_CFLAGS_COMPILE = "-Wno-error -fpic"; - installFlags = [ "USE_SYSTEM_LUA=yes" "USE_SYSTEM_MPACK=yes" - "MPACK_LUA_VERSION=${(builtins.parseDrvName lua.name).version}" - "LUA_INCLUDE=-I${lua}/include" - "LUA_CMOD_INSTALLDIR=$$out/lib/lua/${lua.luaversion}" + "MPACK_LUA_VERSION=${lua.version}" + "LUA_CMOD_INSTALLDIR=$(out)/lib/lua/${lua.luaversion}" ]; meta = with stdenv.lib; { |