diff options
| author | Francesco Gazzetta <fgaz@fgaz.me> | 2023-10-15 15:07:54 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-10-15 15:07:54 +0000 |
| commit | a211fe04168ee4c243561ccfc8f423aa5f31509c (patch) | |
| tree | 80a476f8e55cdbe5863225320bd6458d0b5322d6 /pkgs/development/interpreters | |
| parent | f41b8ce64bb2269beaefba0ad13ee3745f30030e (diff) | |
| parent | 48926aa490da5d615d99949a73a272ccdc9ec3fa (diff) | |
| download | nixlib-a211fe04168ee4c243561ccfc8f423aa5f31509c.tar nixlib-a211fe04168ee4c243561ccfc8f423aa5f31509c.tar.gz nixlib-a211fe04168ee4c243561ccfc8f423aa5f31509c.tar.bz2 nixlib-a211fe04168ee4c243561ccfc8f423aa5f31509c.tar.lz nixlib-a211fe04168ee4c243561ccfc8f423aa5f31509c.tar.xz nixlib-a211fe04168ee4c243561ccfc8f423aa5f31509c.tar.zst nixlib-a211fe04168ee4c243561ccfc8f423aa5f31509c.zip | |
Merge pull request #253638 from Cynerd/jimtcl-sdl-cross
jimtcl: Fix cross compilation and allow disable of SDL
Diffstat (limited to 'pkgs/development/interpreters')
| -rw-r--r-- | pkgs/development/interpreters/jimtcl/default.nix | 15 |
1 files changed, 11 insertions, 4 deletions
diff --git a/pkgs/development/interpreters/jimtcl/default.nix b/pkgs/development/interpreters/jimtcl/default.nix index ed0ddc7da22f..e478ff945472 100644 --- a/pkgs/development/interpreters/jimtcl/default.nix +++ b/pkgs/development/interpreters/jimtcl/default.nix @@ -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 |