diff options
| author | Jörg Thalheim <Mic92@users.noreply.github.com> | 2018-09-01 12:09:38 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-09-01 12:09:38 +0100 |
| commit | a74919358602778796d5e52d628c99db72916011 (patch) | |
| tree | 77d8fd7aa73e118b4b3c0182af25d95c788620e4 | |
| parent | fbad0bc8f9cf6e4d60732798355ef14e0a5259f7 (diff) | |
| parent | 9cd5e292e3adb6001d99cf2ff05475d77634f41a (diff) | |
| download | nixlib-a74919358602778796d5e52d628c99db72916011.tar nixlib-a74919358602778796d5e52d628c99db72916011.tar.gz nixlib-a74919358602778796d5e52d628c99db72916011.tar.bz2 nixlib-a74919358602778796d5e52d628c99db72916011.tar.lz nixlib-a74919358602778796d5e52d628c99db72916011.tar.xz nixlib-a74919358602778796d5e52d628c99db72916011.tar.zst nixlib-a74919358602778796d5e52d628c99db72916011.zip | |
Merge pull request #45870 from bignaux/navit
Navit
| -rw-r--r-- | pkgs/applications/misc/navit/default.nix | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/pkgs/applications/misc/navit/default.nix b/pkgs/applications/misc/navit/default.nix index 5d591243f50d..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 { @@ -68,10 +68,11 @@ stdenv.mkDerivation rec { ''; # TODO: fix upstream? - postFixup = '' - for lib in $(find "$out/lib/navit/" -iname "*.so" ); do - patchelf --set-rpath ${makeLibraryPath buildInputs} $lib - done + libPath = stdenv.lib.makeLibraryPath ([ stdenv.cc.libc ] ++ buildInputs ); + postFixup = + '' + find "$out/lib" -type f -name "*.so" -exec patchelf --set-rpath $libPath {} \; + wrapProgram $out/bin/navit \ --prefix PATH : ${makeBinPath ( optional xkbdSupport xkbd |