diff options
author | Sandro <sandro.jaeckel@gmail.com> | 2021-06-08 17:45:43 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2021-06-08 17:45:43 +0200 |
commit | 718c1fb6540bab84ecac22601bc84d8350b8c088 (patch) | |
tree | 7ec9309595a0cc63ee3e682578857b93f9a852c9 /pkgs/applications | |
parent | 683bc6ab465c87e668b7afb1ae6f36ebb2402bda (diff) | |
parent | eb09c6f9530987a76e4d7961414b5dbfe4c42f05 (diff) |
Merge pull request #125903 from fortuneteller2k/navit
navit: remove
Diffstat (limited to 'pkgs/applications')
-rw-r--r-- | pkgs/applications/misc/navit/CMakeLists.txt.patch | 13 | ||||
-rw-r--r-- | pkgs/applications/misc/navit/default.nix | 90 |
2 files changed, 0 insertions, 103 deletions
diff --git a/pkgs/applications/misc/navit/CMakeLists.txt.patch b/pkgs/applications/misc/navit/CMakeLists.txt.patch deleted file mode 100644 index 7f8a75f319be2..0000000000000 --- a/pkgs/applications/misc/navit/CMakeLists.txt.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 763f75b..defa74a 100755 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -212,7 +212,7 @@ CHECK_INCLUDE_FILES(endian.h HAVE_ENDIAN_H) - CHECK_INCLUDE_FILES(stdint.h HAVE_STDINT_H) - CHECK_INCLUDE_FILES(byteswap.h HAVE_BYTESWAP_H) - CHECK_LIBRARY_EXISTS(gypsy gypsy_control_get_default "" GYPSY_FOUND) --CHECK_INCLUDE_FILES(libspeechd.h HAVE_LIBSPEECHD) -+CHECK_INCLUDE_FILES(speech-dispatcher/libspeechd.h HAVE_LIBSPEECHD) - CHECK_INCLUDE_FILES(sys/socket.h HAVE_SOCKET) - CHECK_INCLUDE_FILES(sys/shm.h HAVE_SHMEM) - CHECK_FUNCTION_EXISTS(snprintf HAVE_SNPRINTF) diff --git a/pkgs/applications/misc/navit/default.nix b/pkgs/applications/misc/navit/default.nix deleted file mode 100644 index c041c2969274e..0000000000000 --- a/pkgs/applications/misc/navit/default.nix +++ /dev/null @@ -1,90 +0,0 @@ -{ lib, stdenv, fetchFromGitHub, pkg-config, gtk2, fontconfig, freetype, imlib2 -, SDL_image, libGLU, libGL, libXmu, freeglut, pcre, dbus, dbus-glib, glib -, librsvg, freeimage, libxslt, cairo, gdk-pixbuf, pango -, atk, patchelf, fetchurl, bzip2, python, gettext, quesoglc -, gd, cmake, shapelib, SDL_ttf, fribidi, makeWrapper -, qtquickcontrols, qtmultimedia, qtspeech, qtsensors -, qtlocation, qtdeclarative, qtsvg -, qtSupport ? false, qtbase #need to fix qt_qpainter -, sdlSupport ? true, SDL -, xkbdSupport ? true, xkbd -, espeakSupport ? true, espeak -, postgresqlSupport ? false, postgresql -, speechdSupport ? false, speechd ? null -}: - -assert speechdSupport -> speechd != null; - -with lib; -stdenv.mkDerivation rec { - pname = "navit"; - version = "0.5.3"; - - src = fetchFromGitHub { - owner = "navit-gps"; - repo = "navit"; - rev = "v${version}"; - sha256 = "071drvqzxpxbfh0lf0lra5a97rv8ny40l96n9xl0dx0s8w30j61i"; - }; - - sample_map = fetchurl { - url = "http://www.navit-project.org/maps/osm_bbox_11.3,47.9,11.7,48.2.osm.bz2"; - name = "sample_map.bz2"; - sha256 = "0vg6b6rhsa2cxqj4rbhfhhfss71syhnfa6f1jg2i2d7l88dm5x7d"; - }; - - patches = [ ./CMakeLists.txt.patch ]; - - NIX_CFLAGS_COMPILE = toString (optional sdlSupport "-I${SDL.dev}/include/SDL" - ++ optional speechdSupport "-I${speechd}/include/speech-dispatcher"); - - # we choose only cmdline and speech-dispatcher speech options. - # espeak builtins is made for non-cmdline OS as winCE - cmakeFlags = [ - "-DSAMPLE_MAP=n " "-DCMAKE_BUILD_TYPE=Release" - "-Dspeech/qt5_espeak=FALSE" "-Dsupport/espeak=FALSE" - ]; - - buildInputs = [ - gtk2 fontconfig freetype imlib2 libGLU libGL freeimage - libxslt libXmu freeglut python gettext quesoglc gd - fribidi pcre dbus dbus-glib librsvg shapelib glib - cairo gdk-pixbuf pango atk - ] ++ optionals sdlSupport [ SDL SDL_ttf SDL_image ] - ++ optional postgresqlSupport postgresql - ++ optional speechdSupport speechd - ++ optionals qtSupport [ - qtquickcontrols qtmultimedia qtspeech qtsensors - qtbase qtlocation qtdeclarative qtsvg - ]; - - nativeBuildInputs = [ makeWrapper pkg-config cmake patchelf bzip2 ]; - - # we dont want blank screen by defaut - postInstall = '' - # emulate DSAMPLE_MAP - mkdir -p $out/share/navit/maps/ - bzcat "${sample_map}" | $out/bin/maptool "$out/share/navit/maps/osm_bbox_11.3,47.9,11.7,48.2.bin" - ''; - - # TODO: fix upstream? - libPath = 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 - ++ optional espeakSupport espeak - ++ optional speechdSupport speechd ) } - ''; - - meta = { - homepage = "https://www.navit-project.org"; - description = "Car navigation system with routing engine using OSM maps"; - license = licenses.gpl2; - maintainers = [ ]; - platforms = platforms.linux; - }; -} |