public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

luajit: declare lua in propagatedBuildInputs, remove from osrm-backend's buildInputs

Browse Source
This commit is contained in:
Robert Scott 2015-03-17 22:05:13 +00:00
parent c8da20fa5e
commit 5a45003800
2 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pkgs/development/libraries/luabind/default.nix
View File

@ -12,6 +12,8 @@ stdenv.mkDerivation rec {
buildInputs = [ boost-build lua boost ]; buildInputs = [ boost-build lua boost ];
propagatedBuildInputs = [ lua ];
buildPhase = "LUA_PATH=${lua} bjam release"; buildPhase = "LUA_PATH=${lua} bjam release";
installPhase = "LUA_PATH=${lua} bjam --prefix=$out release install"; installPhase = "LUA_PATH=${lua} bjam --prefix=$out release install";

2
pkgs/servers/osrm-backend/default.nix
View File

@ -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"; postInstall = "mkdir -p $out/share/osrm-backend && cp -r ../profiles $out/share/osrm-backend/profiles";