Unverified Commit 672efa69 authored by Weijia Wang's avatar Weijia Wang Committed by GitHub
Browse files

Merge pull request #247338 from wegank/slib-bump

slibGuile: 3b5 -> 3b7
parents 8fcd44ee ae742829
Loading
Loading
Loading
Loading
+18 −8
Original line number Diff line number Diff line
{ 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 (?!).
+1 −2
Original line number Diff line number Diff line
@@ -24749,8 +24749,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 { };