From 7a3e154c27b5df288ddd3f428adc1e1030fcf88c Mon Sep 17 00:00:00 2001
From: Robert Scott <code@humanleg.org.uk>
Date: Sat, 26 Mar 2016 17:38:50 +0000
Subject: [PATCH 1/2] osrm-backend: add patch fixing build by un-hard-coding
 gcc-ar and gcc-ranlib paths

---
 .../servers/osrm-backend/4.5.0-gcc-binutils.patch | 15 +++++++++++++++
 pkgs/servers/osrm-backend/default.nix             |  1 +
 2 files changed, 16 insertions(+)
 create mode 100644 pkgs/servers/osrm-backend/4.5.0-gcc-binutils.patch

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..43db076b2a9b 100644
--- a/pkgs/servers/osrm-backend/default.nix
+++ b/pkgs/servers/osrm-backend/default.nix
@@ -10,6 +10,7 @@ stdenv.mkDerivation rec {
 
   patches = [
     ./4.5.0-openmp.patch
+    ./4.5.0-gcc-binutils.patch
     (substituteAll {
       src = ./4.5.0-default-profile-path.template.patch;
     })

From 0fdf7106e5db0ff9fdfcf46bcfae81bfb581df84 Mon Sep 17 00:00:00 2001
From: Robert Scott <code@humanleg.org.uk>
Date: Sat, 26 Mar 2016 18:07:55 +0000
Subject: [PATCH 2/2] osrm-backend: switch src to use fetchFromGitHub

---
 pkgs/servers/osrm-backend/default.nix | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/pkgs/servers/osrm-backend/default.nix b/pkgs/servers/osrm-backend/default.nix
index 43db076b2a9b..9c1dd23b39f0 100644
--- a/pkgs/servers/osrm-backend/default.nix
+++ b/pkgs/servers/osrm-backend/default.nix
@@ -1,11 +1,13 @@
-{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 = [