From 939052f6e80aea8f9b35a7a290c2b79dc3b6624d6c0c91b1901a4c98ffcca460 Mon Sep 17 00:00:00 2001
From: Daniel Ziltener <dziltener@lyrion.ch>
Date: Wed, 11 Dec 2024 16:04:16 +0100
Subject: [PATCH] Add missing import

---
 apropos-api.scm      |  1 +
 apropos.egg          |  2 +-
 apropos.release-info |  3 ++-
 nix/chicken.nix      | 18 +++++++++---------
 shell.nix            |  3 ---
 5 files changed, 13 insertions(+), 14 deletions(-)

diff --git a/apropos-api.scm b/apropos-api.scm
index 14b063e..ab166d3 100644
--- a/apropos-api.scm
+++ b/apropos-api.scm
@@ -39,6 +39,7 @@
   apropos apropos-list apropos-information-list)
 
 (import scheme)
+(import (scheme base))
 (import (chicken base))
 (import (chicken fixnum))
 (import (chicken foreign))
diff --git a/apropos.egg b/apropos.egg
index ffe18ad..99c7dba 100644
--- a/apropos.egg
+++ b/apropos.egg
@@ -2,7 +2,7 @@
 ;;;; Kon Lovett, Jul '18
 
 ((synopsis "CHICKEN apropos")
- (version "3.11.2")
+ (version "3.11.3")
  (category misc)
  (author "Kon Lovett")
  (license "BSD")
diff --git a/apropos.release-info b/apropos.release-info
index 468772b..eb9e7cb 100644
--- a/apropos.release-info
+++ b/apropos.release-info
@@ -1,4 +1,5 @@
 ;; -*- Scheme -*-
 (repo git "https://forgejo.lyrion.ch/Chicken/apropos")
 (uri targz "https://forgejo.lyrion.ch/Chicken/apropos/archive/{egg-release}.tar.gz")
-(release "3.11.2") ;; Port to Chicken 6
\ No newline at end of file
+(release "3.11.3") ;; Missing import
+(release "3.11.2") ;; Port to Chicken 6
diff --git a/nix/chicken.nix b/nix/chicken.nix
index 1828445..1416332 100644
--- a/nix/chicken.nix
+++ b/nix/chicken.nix
@@ -6,7 +6,7 @@
   fetchurl,
   makeWrapper,
   darwin,
-  tcc-mob,
+  #tcc-mob,
   version ? "git",
   testers
 }:
@@ -27,8 +27,8 @@ stdenv.mkDerivation (finalAttrs: {
   srcs = [
     (fetchgit {
       url = "git://code.call-cc.org/chicken-core";
-      rev = "dbffda19e57c3be092e5a9174f1829632f5fa5a7";
-      sha256 = "sha256-zWjf9JS4H1buBlkmUhIv+odCQzXaOPtI7VfIaQUhe6Q=";
+      rev = "bd76cc720650e04ca349c3699d517abcc0f2a847";
+      sha256 = "sha256-mY7o06sEQ9P6WvYLQWp60oCBbcojqLbDtyCgD/KEtqM=";
     })
     (fetchurl {
       url = "https://code.call-cc.org/dev-snapshots/2024/07/01/chicken-6.0.0-bootstrap.tar.gz";
@@ -53,11 +53,10 @@ stdenv.mkDerivation (finalAttrs: {
         *)
             mkcmd=make;;
     esac
-    export CC="${tcc-mob}/bin/tcc"
     $mkcmd C_COMPILER=$CC PREFIX="$(pwd)"/../snapshot
     $mkcmd C_COMPILER=$CC PREFIX="$(pwd)"/../snapshot install
     cd ../..
-    ./configure --chicken "$(pwd)"/boot/snapshot/bin/chicken --c-compiler "${tcc-mob}/bin/tcc"
+    ./configure --chicken "$(pwd)"/boot/snapshot/bin/chicken
     $mkcmd boot-chicken
   '';
 
@@ -73,7 +72,7 @@ stdenv.mkDerivation (finalAttrs: {
  makeFlags = [
     "PLATFORM=${platform}"
     "PREFIX=$(out)"
-    "C_COMPILER=${tcc-mob}/bin/tcc"
+    #"C_COMPILER=${tcc-mob}/bin/tcc"
     "CXX_COMPILER=$(CXX)"
   ] ++ (lib.optionals stdenv.isDarwin [
     "XCODE_TOOL_PATH=${darwin.binutils.bintools}/bin"
@@ -81,20 +80,21 @@ stdenv.mkDerivation (finalAttrs: {
     "POSTINSTALL_PROGRAM=install_name_tool"
   ]) ++ (lib.optionals (stdenv.hostPlatform != stdenv.buildPlatform) [
     "HOSTSYSTEM=${stdenv.hostPlatform.config}"
-    "TARGET_C_COMPILER=${tcc-mob}/bin/${stdenv.cc.targetPrefix}tcc"
+    #"TARGET_C_COMPILER=${tcc-mob}/bin/${stdenv.cc.targetPrefix}tcc"
+    "TARGET_CXX_COMPILER=${stdenv.cc}/bin/${stdenv.cc.targetPrefix}c"
     "TARGET_CXX_COMPILER=${stdenv.cc}/bin/${stdenv.cc.targetPrefix}c++"
   ]);
 
   nativeBuildInputs = [
     makeWrapper
     pkgs.hostname
-    tcc-mob
+    #tcc-mob
   ] ++ lib.optionals (stdenv.isDarwin && stdenv.isAarch64) [
     darwin.autoSignDarwinBinariesHook
   ];
 
   configurePhase = ''
-    ./configure --chicken ./chicken-boot --prefix $PREFIX  --platform=$PLATFORM --c-compiler "${tcc-mob}/bin/tcc"
+    ./configure --chicken ./chicken-boot --prefix $PREFIX  --platform=$PLATFORM
   '';
   
   doCheck = !stdenv.isDarwin;
diff --git a/shell.nix b/shell.nix
index 6b85934..edff8c3 100644
--- a/shell.nix
+++ b/shell.nix
@@ -1,14 +1,12 @@
 with import <nixpkgs> {
   overlays = [
     (final: prev: {
-      tcc-mob = final.callPackage ./nix/tinycc.nix { stdenv = final.gcc13Stdenv; };
       chicken = final.callPackage ./nix/chicken.nix { stdenv = final.gcc13Stdenv; };
     })
   ];
 };
 mkShell {
   packages = with pkgs; [
-    tcc-mob
     chicken
     rlwrap
   ]
@@ -22,7 +20,6 @@ mkShell {
   # ])
   ;
   shellHook = ''
-    export CC="${pkgs.tcc-mob}/bin/tcc"
     export CHICKEN_PREFIX="$HOME/.chicken"
     export CHICKEN_INSTALL_REPOSITORY="$HOME/.chicken/eggs"
     export CHICKEN_REPOSITORY_PATH="${pkgs.chicken}/lib/chicken/12:$HOME/.chicken/eggs"