slibGuile: 3b5 -> 3b7

+19 -10
+18 -8
pkgs/development/libraries/slib/default.nix
··· 1 - { fetchurl, lib, stdenv, unzip, scheme, texinfo }: 1 + { lib, stdenv, fetchurl, scheme, texinfo, unzip }: 2 2 3 3 stdenv.mkDerivation rec { 4 4 pname = "slib"; 5 - version = "3b5"; 5 + version = "3b7"; 6 6 7 7 src = fetchurl { 8 8 url = "https://groups.csail.mit.edu/mac/ftpdir/scm/${pname}-${version}.zip"; 9 - sha256 = "0q0p2d53p8qw2592yknzgy2y1p5a9k7ppjx0cfrbvk6242c4mdpq"; 9 + hash = "sha256-9dXNrTNTlaWlqjfv/iiqgHiyFuo5kR9lGSlnjxrCKLY="; 10 10 }; 11 11 12 - patches = [ ./catalog-in-library-vicinity.patch ]; 12 + patches = [ 13 + ./catalog-in-library-vicinity.patch 14 + ]; 13 15 14 - nativeBuildInputs = [ unzip ]; 15 - buildInputs = [ scheme texinfo ]; 16 + # slib:require unsupported feature color-database 17 + postPatch = '' 18 + substituteInPlace Makefile \ 19 + --replace " clrnamdb.scm" "" 20 + ''; 21 + 22 + nativeBuildInputs = [ scheme texinfo unzip ]; 23 + buildInputs = [ scheme ]; 16 24 17 25 postInstall = '' 18 26 ln -s mklibcat{.scm,} 19 27 SCHEME_LIBRARY_PATH="$out/lib/slib" make catalogs 20 28 21 - sed -i "$out/bin/slib" \ 22 - -e "/^SCHEME_LIBRARY_PATH/i export PATH=\"${scheme}/bin:\$PATH\"" 29 + sed -i \ 30 + -e '2i export PATH="${scheme}/bin:$PATH"' \ 31 + -e '3i export GUILE_AUTO_COMPILE=0' \ 32 + $out/bin/slib 23 33 ''; 24 34 25 35 # There's no test suite (?!).
+1 -2
pkgs/top-level/all-packages.nix
··· 24747 24747 slang = callPackage ../development/libraries/slang { }; 24748 24748 24749 24749 slibGuile = callPackage ../development/libraries/slib { 24750 - scheme = guile_1_8; 24751 - texinfo = texinfo4; # otherwise erros: must be after `@defun' to use `@defunx' 24750 + scheme = guile; 24752 24751 }; 24753 24752 24754 24753 smpeg = callPackage ../development/libraries/smpeg { };