From 5a45003800d0aa9a2546ae0f3658eef1f1ceeccd Mon Sep 17 00:00:00 2001 From: Robert Scott Date: Tue, 17 Mar 2015 22:05:13 +0000 Subject: [PATCH] luajit: declare lua in propagatedBuildInputs, remove from osrm-backend's buildInputs --- pkgs/development/libraries/luabind/default.nix | 2 ++ pkgs/servers/osrm-backend/default.nix | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/pkgs/development/libraries/luabind/default.nix b/pkgs/development/libraries/luabind/default.nix index 5afbb71ab65..edb914123e1 100644 --- a/pkgs/development/libraries/luabind/default.nix +++ b/pkgs/development/libraries/luabind/default.nix @@ -12,6 +12,8 @@ stdenv.mkDerivation rec { buildInputs = [ boost-build lua boost ]; + propagatedBuildInputs = [ lua ]; + buildPhase = "LUA_PATH=${lua} bjam release"; installPhase = "LUA_PATH=${lua} bjam --prefix=$out release install"; diff --git a/pkgs/servers/osrm-backend/default.nix b/pkgs/servers/osrm-backend/default.nix index 8e33d6e30b9..37d3650f683 100644 --- a/pkgs/servers/osrm-backend/default.nix +++ b/pkgs/servers/osrm-backend/default.nix @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { }) ]; - buildInputs = [ cmake luabind luabind.lua libosmpbf stxxl tbb boost expat protobuf bzip2 zlib ]; + buildInputs = [ cmake luabind libosmpbf stxxl tbb boost expat protobuf bzip2 zlib ]; postInstall = "mkdir -p $out/share/osrm-backend && cp -r ../profiles $out/share/osrm-backend/profiles";