BoomMicrophone/nixpkgs-suyu
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge pull request #253638 from Cynerd/jimtcl-sdl-cross

Browse source 
jimtcl: Fix cross compilation and allow disable of SDL
This commit is contained in:
Francesco Gazzetta 2023-10-15 15:07:54 +00:00 committed by GitHub
commit a211fe0416
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 11 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
pkgs/development/interpreters/jimtcl/default.nix
View file

@ -5,12 +5,15 @@
, asciidoc , asciidoc
, pkg-config , pkg-config
, inetutils , inetutils
, tcl
, sqlite , sqlite
, readline , readline
, SDL , SDL
, SDL_gfx , SDL_gfx
, openssl , openssl
, SDLSupport ? true
}: }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
@ -27,15 +30,17 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [ nativeBuildInputs = [
pkg-config pkg-config
asciidoc asciidoc
tcl
]; ];
buildInputs = [ buildInputs = [
sqlite sqlite
readline readline
openssl
] ++ (lib.optionals SDLSupport [
SDL SDL
SDL_gfx SDL_gfx
openssl ]);
];
configureFlags = [ configureFlags = [
"--shared" "--shared"
@ -44,11 +49,10 @@ stdenv.mkDerivation rec {
"--with-ext=binary" "--with-ext=binary"
"--with-ext=sqlite3" "--with-ext=sqlite3"
"--with-ext=readline" "--with-ext=readline"
"--with-ext=sdl"
"--with-ext=json" "--with-ext=json"
"--enable-utf8" "--enable-utf8"
"--ipv6" "--ipv6"
]; ] ++ (lib.optional SDLSupport "--with-ext=sdl");
enableParallelBuilding = true; enableParallelBuilding = true;
@ -58,6 +62,9 @@ stdenv.mkDerivation rec {
rm tests/exec2.test rm tests/exec2.test
# requires internet access # requires internet access
rm tests/ssl.test 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 # test posix-1.6 needs the "hostname" command