From 0a0ee27dc2a77a2ae88c53cee814f997323ca6f0 Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Sat, 9 Mar 2024 04:20:00 +0000 Subject: [PATCH 1/2] scsh: fix build on darwin --- pkgs/development/interpreters/scsh/default.nix | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/pkgs/development/interpreters/scsh/default.nix b/pkgs/development/interpreters/scsh/default.nix index 45b59124b782..098e19cdd1ee 100644 --- a/pkgs/development/interpreters/scsh/default.nix +++ b/pkgs/development/interpreters/scsh/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, autoreconfHook, scheme48 }: +{ lib, stdenv, fetchFromGitHub, autoreconfHook, scheme48, fetchpatch }: stdenv.mkDerivation { pname = "scsh"; @@ -12,6 +12,15 @@ stdenv.mkDerivation { fetchSubmodules = true; }; + patches = [ + # Don't not include util.h if libutil.h is available + # https://github.com/scheme/scsh/pull/49 + (fetchpatch { + url = "https://github.com/scheme/scsh/commit/b04e902de983761d7f432b2cfa364ca5d162a364.patch"; + hash = "sha256-XSHzzCOBkraqW2re1ePoFl9tKQB81iQ0W9wvv83iGdA="; + }) + ]; + nativeBuildInputs = [ autoreconfHook ]; buildInputs = [ scheme48 ]; configureFlags = [ "--with-scheme48=${scheme48}" ]; From a0dd471783f5747f50f8b4171d2f165d53d90074 Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Sat, 9 Mar 2024 04:20:00 +0000 Subject: [PATCH 2/2] scsh: add meta.mainProgram --- pkgs/development/interpreters/scsh/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/development/interpreters/scsh/default.nix b/pkgs/development/interpreters/scsh/default.nix index 098e19cdd1ee..b3b7db8537a2 100644 --- a/pkgs/development/interpreters/scsh/default.nix +++ b/pkgs/development/interpreters/scsh/default.nix @@ -31,5 +31,6 @@ stdenv.mkDerivation { license = licenses.bsd3; maintainers = with maintainers; [ joachifm ]; platforms = with platforms; unix; + mainProgram = "scsh"; }; }