dev/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions 2 Packages Projects Releases Wiki Activity

navit: 0.5.1 -> 0.5.3 (#45899)

Browse Source
This commit is contained in:
Bignaux Ronan 2018-09-01 14:06:47 +02:00 committed by xeji
parent 8a3397d11e
commit 003b15132c
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
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.2"; version = "0.5.3";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "navit-gps"; owner = "navit-gps";
repo = "navit"; repo = "navit";
rev = "v${version}"; rev = "v${version}";
sha256 = "11w85rlx612lws4s3q36li4iqib9b35v94kzf2zh9g1aphwqh2qa"; sha256 = "071drvqzxpxbfh0lf0lra5a97rv8ny40l96n9xl0dx0s8w30j61i";
}; };
sample_map = fetchurl { sample_map = fetchurl {
@ -41,7 +41,7 @@ stdenv.mkDerivation rec {
# we choose only cmdline and speech-dispatcher speech options. # we choose only cmdline and speech-dispatcher speech options.
# espeak builtins is made for non-cmdline OS as winCE # espeak builtins is made for non-cmdline OS as winCE
cmakeFlags = [ cmakeFlags = [
"-DSAMPLE_MAP=n " "-DCMAKE_BUILD_TYPE=RelWithDebInfo" "-DSAMPLE_MAP=n " "-DCMAKE_BUILD_TYPE=Release"
"-Dspeech/qt5_espeak=FALSE" "-Dsupport/espeak=FALSE" "-Dspeech/qt5_espeak=FALSE" "-Dsupport/espeak=FALSE"
]; ];
@ -71,7 +71,7 @@ stdenv.mkDerivation rec {
libPath = stdenv.lib.makeLibraryPath ([ stdenv.cc.libc ] ++ buildInputs ); libPath = stdenv.lib.makeLibraryPath ([ stdenv.cc.libc ] ++ buildInputs );
postFixup = postFixup =
'' ''
find "$out/lib" -type f -name "*.so" -exec patchelf --set-rpath $libPath {} \; 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 (