From 60d1260775fe29a515f4f2513320136eb41a4db4 Mon Sep 17 00:00:00 2001
From: Tom Willemse <tom@ryuslash.org>
Date: Mon, 6 Mar 2023 10:21:23 -0800
Subject: [PATCH] Add custom scsh from upstream to test

---
 oni/packages/scsh.scm | 58 ++++++++++++++++++++++++++++++++++++-------
 1 file changed, 49 insertions(+), 9 deletions(-)

diff --git a/oni/packages/scsh.scm b/oni/packages/scsh.scm
index 6f76555..dc08654 100644
--- a/oni/packages/scsh.scm
+++ b/oni/packages/scsh.scm
@@ -1,17 +1,57 @@
 (define-module (oni packages scsh)
   #:use-module ((guix licenses) #:prefix license:)
+  #:use-module (gnu packages)
   #:use-module (gnu packages autotools)
-  #:use-module ((gnu packages shells) #:prefix shells:)
+  #:use-module (gnu packages scheme)
   #:use-module (guix build-system gnu)
   #:use-module (guix git-download)
   #:use-module (guix packages))
 
 (define-public scsh
-  (package
-   (inherit shells:scsh)
-   ;; (native-search-paths
-   ;;  (list (search-path-specification
-   ;;         (variable "SCSH_LIB_DIRS")
-   ;;         (separator #f)
-   ;;         (files '("share/scsh-0.7")))))
-   ))
+  (let ((commit "114432435e4eadd54334df6b37fcae505079b49f")
+        (revision "1"))
+    (package
+      (name "scsh")
+      (version (string-append "0.0.0-" revision "." (string-take commit 7)))
+      (source
+       (origin
+         (method git-fetch)
+         (uri (git-reference
+               (url "https://github.com/scheme/scsh")
+               (commit commit)))
+         (file-name (string-append name "-" version "-checkout"))
+         (sha256
+          (base32
+           "1ghk08akiz7hff1pndi8rmgamgcrn2mv9asbss9l79d3c2iaav3q"))
+         (patches (search-patches "scsh-nonstring-search-path.patch"))))
+      (build-system gnu-build-system)
+      (arguments
+       `(#:test-target "test"
+         #:phases
+         (modify-phases %standard-phases
+           (add-before 'configure 'replace-rx
+             (lambda* (#:key inputs #:allow-other-keys)
+               (let* ((rx (assoc-ref inputs "scheme48-rx"))
+                      (rxpath (string-append rx "/share/scheme48-"
+                                             ,(package-version scheme48)
+                                             "/rx")))
+                 (delete-file-recursively "rx")
+                 (symlink rxpath "rx"))
+               #t)))))
+      (inputs
+       (list scheme48 scheme48-rx))
+      (native-inputs
+       (list autoconf automake))
+      (native-search-paths
+       (list (search-path-specification
+              (variable "SCSH_LIB_DIRS")
+              (separator " ")
+              (files '("share/scsh-0.7")))))
+      (home-page "https://github.com/scheme/scsh")
+      (synopsis "Unix shell embedded in Scheme")
+      (description
+       "Scsh is a Unix shell embedded in Scheme.  Scsh has two main
+components: a process notation for running programs and setting up pipelines
+and redirections, and a complete syscall library for low-level access to the
+operating system.")
+      (license license:bsd-3))))