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

Merge pull request #14231 from risicle/osrm_fixes

Browse Source 
Osrm build fixes
This commit is contained in:
Domen Kožar 2016-03-26 20:07:46 +00:00
commit 0e977f6658
2 changed files with 22 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
pkgs/servers/osrm-backend/4.5.0-gcc-binutils.patch Normal file
View File

@ -0,0 +1,15 @@
diff --git a/CMakeLists.txt b/CMakeLists.txt
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -127,8 +127,9 @@ if(CMAKE_BUILD_TYPE MATCHES Release)
if ("${CMAKE_CXX_COMPILER_ID}" STREQUAL "GNU" AND
NOT "${CMAKE_CXX_COMPILER_VERSION}" VERSION_LESS "4.9.0" AND NOT MINGW)
message(STATUS "Using gcc specific binutils for LTO.")
- set(CMAKE_AR "/usr/bin/gcc-ar")
- set(CMAKE_RANLIB "/usr/bin/gcc-ranlib")
+ # Just let PATH do its job
+ set(CMAKE_AR "gcc-ar")
+ set(CMAKE_RANLIB "gcc-ranlib")
endif()
endif (HAS_LTO_FLAG)
endif()

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

@ -1,15 +1,18 @@
{stdenv, fetchurl, cmake, luabind, libosmpbf, stxxl, tbb, boost, expat, protobuf, bzip2, zlib, substituteAll}:
{stdenv, fetchFromGitHub, cmake, luabind, libosmpbf, stxxl, tbb, boost, expat, protobuf, bzip2, zlib, substituteAll}:
stdenv.mkDerivation rec {
name = "osrm-backend-4.5.0";
src = fetchurl {
url = "https://github.com/Project-OSRM/osrm-backend/archive/v4.5.0.tar.gz";
sha256 = "af61e883051f2ecb73520ace6f17cc6da30edc413208ff7cf3d87992eca0756c";
src = fetchFromGitHub {
rev = "v4.5.0";
owner = "Project-OSRM";
repo = "osrm-backend";
sha256 = "19a8d1llvsrysyk1q48dpmh75qcbibfjlszndrysk11yh62hdvsz";
};
patches = [
./4.5.0-openmp.patch
./4.5.0-gcc-binutils.patch
(substituteAll {
src = ./4.5.0-default-profile-path.template.patch;
})