ilyakooo0/nixpkgs
1
0
Fork 0
mirror of https://github.com/ilyakooo0/nixpkgs.git synced 2024-11-14 15:36:47 +03:00
Code Issues Projects Releases Wiki Activity

Merge pull request #45870 from bignaux/navit

Browse Source 
Navit
This commit is contained in:
Jörg Thalheim 2018-09-01 12:09:38 +01:00 committed by GitHub
commit a749193586
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
pkgs/applications/misc/navit/default.nix
View File

@ -18,13 +18,13 @@ assert speechdSupport -> speechd != null;
with stdenv.lib; with stdenv.lib;
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "navit-${version}"; name = "navit-${version}";
version = "0.5.1"; version = "0.5.2";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "navit-gps"; owner = "navit-gps";
repo = "navit"; repo = "navit";
rev = "v${version}"; rev = "v${version}";
sha256 = "0jf2gjh2sszr5y5c2wvamfj2qggi2y5k3ynb32pak9vhf5xyl5xj"; sha256 = "11w85rlx612lws4s3q36li4iqib9b35v94kzf2zh9g1aphwqh2qa";
}; };
sample_map = fetchurl { sample_map = fetchurl {
@ -68,10 +68,11 @@ stdenv.mkDerivation rec {
''; '';
# TODO: fix upstream? # TODO: fix upstream?
postFixup = '' libPath = stdenv.lib.makeLibraryPath ([ stdenv.cc.libc ] ++ buildInputs );
for lib in $(find "$out/lib/navit/" -iname "*.so" ); do postFixup =
patchelf --set-rpath ${makeLibraryPath buildInputs} $lib ''
done find "$out/lib" -type f -name "*.so" -exec patchelf --set-rpath $libPath {} \;
wrapProgram $out/bin/navit \ wrapProgram $out/bin/navit \
--prefix PATH : ${makeBinPath ( --prefix PATH : ${makeBinPath (
optional xkbdSupport xkbd optional xkbdSupport xkbd