From 30ab2300bcf4d1e3e5bf031e67cd089aba828ea0 Mon Sep 17 00:00:00 2001
From: Bignaux Ronan <ronan@aimao.org>
Date: Mon, 27 Aug 2018 23:26:06 +0200
Subject: [PATCH 1/2] navit: fix plugins

---
 pkgs/applications/misc/navit/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/applications/misc/navit/default.nix b/pkgs/applications/misc/navit/default.nix
index 5d591243f50d..ede20d7935be 100644
--- a/pkgs/applications/misc/navit/default.nix
+++ b/pkgs/applications/misc/navit/default.nix
@@ -68,10 +68,10 @@ stdenv.mkDerivation rec {
   '';
 
   # TODO: fix upstream?
+  libPath = stdenv.lib.makeLibraryPath ([ stdenv.cc.libc ] ++ buildInputs );
   postFixup = ''
-    for lib in $(find "$out/lib/navit/" -iname "*.so" ); do
-      patchelf --set-rpath ${makeLibraryPath buildInputs} $lib
-    done
+	  find "$out/lib" -type f -name "*.so" -exec patchelf --set-rpath $libPath {} \;
+
     wrapProgram $out/bin/navit \
       --prefix PATH : ${makeBinPath (
         optional xkbdSupport xkbd

From 9cd5e292e3adb6001d99cf2ff05475d77634f41a Mon Sep 17 00:00:00 2001
From: Bignaux Ronan <ronan@aimao.org>
Date: Fri, 31 Aug 2018 14:14:07 +0200
Subject: [PATCH 2/2] navit: 5.0.1 -> 5.0.2

---
 pkgs/applications/misc/navit/default.nix | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/pkgs/applications/misc/navit/default.nix b/pkgs/applications/misc/navit/default.nix
index ede20d7935be..3bb93664692d 100644
--- a/pkgs/applications/misc/navit/default.nix
+++ b/pkgs/applications/misc/navit/default.nix
@@ -18,13 +18,13 @@ assert speechdSupport -> speechd != null;
 with stdenv.lib;
 stdenv.mkDerivation rec {
   name = "navit-${version}";
-  version = "0.5.1";
+  version = "0.5.2";
 
   src = fetchFromGitHub {
     owner = "navit-gps";
     repo = "navit";
     rev = "v${version}";
-    sha256 = "0jf2gjh2sszr5y5c2wvamfj2qggi2y5k3ynb32pak9vhf5xyl5xj";
+    sha256 = "11w85rlx612lws4s3q36li4iqib9b35v94kzf2zh9g1aphwqh2qa";
   };
 
   sample_map = fetchurl {
@@ -69,7 +69,8 @@ stdenv.mkDerivation rec {
 
   # TODO: fix upstream?
   libPath = stdenv.lib.makeLibraryPath ([ stdenv.cc.libc ] ++ buildInputs );
-  postFixup = ''
+  postFixup =
+  ''
 	  find "$out/lib" -type f -name "*.so" -exec patchelf --set-rpath $libPath {} \;
 
     wrapProgram $out/bin/navit \