From ae7428291813535fca0d5e419190199837ed9ce1 Mon Sep 17 00:00:00 2001 From: Weijia Wang <9713184+wegank@users.noreply.github.com> Date: Sat, 5 Aug 2023 16:30:01 +0200 Subject: [PATCH] slibGuile: 3b5 -> 3b7 --- pkgs/development/libraries/slib/default.nix | 26 ++++++++++++++------- pkgs/top-level/all-packages.nix | 3 +-- 2 files changed, 19 insertions(+), 10 deletions(-) diff --git a/pkgs/development/libraries/slib/default.nix b/pkgs/development/libraries/slib/default.nix index 56c4eccf434c..91c32b5dd3a8 100644 --- a/pkgs/development/libraries/slib/default.nix +++ b/pkgs/development/libraries/slib/default.nix @@ -1,25 +1,35 @@ -{ fetchurl, lib, stdenv, unzip, scheme, texinfo }: +{ lib, stdenv, fetchurl, scheme, texinfo, unzip }: stdenv.mkDerivation rec { pname = "slib"; - version = "3b5"; + version = "3b7"; src = fetchurl { url = "https://groups.csail.mit.edu/mac/ftpdir/scm/${pname}-${version}.zip"; - sha256 = "0q0p2d53p8qw2592yknzgy2y1p5a9k7ppjx0cfrbvk6242c4mdpq"; + hash = "sha256-9dXNrTNTlaWlqjfv/iiqgHiyFuo5kR9lGSlnjxrCKLY="; }; - patches = [ ./catalog-in-library-vicinity.patch ]; + patches = [ + ./catalog-in-library-vicinity.patch + ]; - nativeBuildInputs = [ unzip ]; - buildInputs = [ scheme texinfo ]; + # slib:require unsupported feature color-database + postPatch = '' + substituteInPlace Makefile \ + --replace " clrnamdb.scm" "" + ''; + + nativeBuildInputs = [ scheme texinfo unzip ]; + buildInputs = [ scheme ]; postInstall = '' ln -s mklibcat{.scm,} SCHEME_LIBRARY_PATH="$out/lib/slib" make catalogs - sed -i "$out/bin/slib" \ - -e "/^SCHEME_LIBRARY_PATH/i export PATH=\"${scheme}/bin:\$PATH\"" + sed -i \ + -e '2i export PATH="${scheme}/bin:$PATH"' \ + -e '3i export GUILE_AUTO_COMPILE=0' \ + $out/bin/slib ''; # There's no test suite (?!). diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 6b07f74822c7..a776769b8d25 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -24747,8 +24747,7 @@ with pkgs; slang = callPackage ../development/libraries/slang { }; slibGuile = callPackage ../development/libraries/slib { - scheme = guile_1_8; - texinfo = texinfo4; # otherwise erros: must be after `@defun' to use `@defunx' + scheme = guile; }; smpeg = callPackage ../development/libraries/smpeg { };