Unverified Commit 48926aa4 authored by Karel Kočí's avatar Karel Kočí
Browse files

jimtcl: Fix cross compilation and allow disable of SDL 

Jimtcl is dependency of OpenOCD that does not need SDL. For some
embedded systems it is beneficial to not pull in graphics related
dependencies to reduce the size. The second reason is that right now
SDL_gfx is not cross compiling and thus OpenOCD can't be cross compiled
either.

This also fixes cross compilation of Jimtcl itself. The attempt to cross
compile resulted in:

  No installed jimsh or tclsh, building local bootstrap jimsh0

The solution here is to add jimtcl to native build dependencies in case
of cross compilation.
parent 29351a88

pkgs/development/interpreters/jimtcl/default.nix

+11 −4
Original line number Diff line number Diff line
@@ -5,12 +5,15 @@ 
, asciidoc

, pkg-config

, inetutils

, tcl



, sqlite

, readline

, SDL

, SDL_gfx

, openssl



, SDLSupport ? true

}:



stdenv.mkDerivation rec {
@@ -27,15 +30,17 @@ stdenv.mkDerivation rec { 
  nativeBuildInputs = [

    pkg-config

    asciidoc

    tcl

  ];



  buildInputs = [

    sqlite

    readline

    openssl

  ] ++ (lib.optionals SDLSupport [

    SDL

    SDL_gfx

    openssl

  ];

  ]);



  configureFlags = [

    "--shared"
@@ -44,11 +49,10 @@ stdenv.mkDerivation rec { 
    "--with-ext=binary"

    "--with-ext=sqlite3"

    "--with-ext=readline"

    "--with-ext=sdl"

    "--with-ext=json"

    "--enable-utf8"

    "--ipv6"

  ];

  ] ++ (lib.optional SDLSupport "--with-ext=sdl");



  enableParallelBuilding = true;
@@ -58,6 +62,9 @@ stdenv.mkDerivation rec { 
    rm tests/exec2.test

    # requires internet access

    rm tests/ssl.test

    # test fails due to timing in some environments

    # https://github.com/msteveb/jimtcl/issues/282

    rm tests/timer.test

  '';



  # test posix-1.6 needs the "hostname" command