diff options
| author | Domen Kožar <domen@dev.si> | 2016-03-26 20:07:46 +0000 |
|---|---|---|
| committer | Domen Kožar <domen@dev.si> | 2016-03-26 20:07:46 +0000 |
| commit | 0e977f66582068a8e01db5bed22f6ca3185c6307 (patch) | |
| tree | f94a9375052858e0069569c54bf54b2d1a09a645 /pkgs | |
| parent | cbdc1bbb98695fdd5d780cd4f6b424ff9f63c96e (diff) | |
| parent | 0fdf7106e5db0ff9fdfcf46bcfae81bfb581df84 (diff) | |
| download | nixlib-0e977f66582068a8e01db5bed22f6ca3185c6307.tar nixlib-0e977f66582068a8e01db5bed22f6ca3185c6307.tar.gz nixlib-0e977f66582068a8e01db5bed22f6ca3185c6307.tar.bz2 nixlib-0e977f66582068a8e01db5bed22f6ca3185c6307.tar.lz nixlib-0e977f66582068a8e01db5bed22f6ca3185c6307.tar.xz nixlib-0e977f66582068a8e01db5bed22f6ca3185c6307.tar.zst nixlib-0e977f66582068a8e01db5bed22f6ca3185c6307.zip | |
Merge pull request #14231 from risicle/osrm_fixes
Osrm build fixes
Diffstat (limited to 'pkgs')
| -rw-r--r-- | pkgs/servers/osrm-backend/4.5.0-gcc-binutils.patch | 15 | ||||
| -rw-r--r-- | pkgs/servers/osrm-backend/default.nix | 11 |
2 files changed, 22 insertions, 4 deletions
diff --git a/pkgs/servers/osrm-backend/4.5.0-gcc-binutils.patch b/pkgs/servers/osrm-backend/4.5.0-gcc-binutils.patch new file mode 100644 index 000000000000..87b9b9501c4c --- /dev/null +++ b/pkgs/servers/osrm-backend/4.5.0-gcc-binutils.patch @@ -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() diff --git a/pkgs/servers/osrm-backend/default.nix b/pkgs/servers/osrm-backend/default.nix index 3e9e2158524c..9c1dd23b39f0 100644 --- a/pkgs/servers/osrm-backend/default.nix +++ b/pkgs/servers/osrm-backend/default.nix @@ -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; }) |