From 4bb5799ce9223b1a941ea082073c05aa5a05f2ae Mon Sep 17 00:00:00 2001 From: Francesco Gazzetta Date: Wed, 23 Mar 2022 14:24:19 +0100 Subject: [PATCH] jimtcl: 0.79 -> 0.81 --- .../interpreters/jimtcl/default.nix | 27 +++++++++++++------ 1 file changed, 19 insertions(+), 8 deletions(-) diff --git a/pkgs/development/interpreters/jimtcl/default.nix b/pkgs/development/interpreters/jimtcl/default.nix index 78b9e40b6470..6a196e6d694f 100644 --- a/pkgs/development/interpreters/jimtcl/default.nix +++ b/pkgs/development/interpreters/jimtcl/default.nix @@ -1,20 +1,30 @@ -{ lib, stdenv, fetchFromGitHub, sqlite, readline, asciidoc, SDL, SDL_gfx }: +{ lib +, stdenv +, fetchFromGitHub -let - makeSDLFlags = map (p: "-I${lib.getDev p}/include/SDL"); +, asciidoc +, pkg-config +, inetutils -in stdenv.mkDerivation rec { +, sqlite +, readline +, SDL +, SDL_gfx +}: + +stdenv.mkDerivation rec { pname = "jimtcl"; - version = "0.79"; + version = "0.81"; src = fetchFromGitHub { owner = "msteveb"; repo = "jimtcl"; rev = version; - sha256 = "1k88hz0v3bi19xdvlp0i9nsx38imzwpjh632w7326zwbv2wldf0h"; + sha256 = "sha256-OpM9y7fQ+18qxl3/5wUCrNA9qiCdA0vTHqLYSw2lvJs="; }; nativeBuildInputs = [ + pkg-config asciidoc ]; @@ -35,8 +45,6 @@ in stdenv.mkDerivation rec { "--ipv6" ]; - NIX_CFLAGS_COMPILE = toString (makeSDLFlags [ SDL SDL_gfx ]); - enableParallelBuilding = true; doCheck = true; @@ -45,6 +53,9 @@ in stdenv.mkDerivation rec { rm tests/exec2.test ''; + # test posix-1.6 needs the "hostname" command + checkInputs = [ inetutils ]; + postInstall = '' ln -sr $out/lib/libjim.so.${version} $out/lib/libjim.so '';