Merge pull request #264288 from sarcasticadmin/rh/1698359072pterm

pterm: init at 6.0.4
This commit is contained in:
Peder Bergebakken Sundt 2023-11-14 01:11:34 +02:00 committed by GitHub
commit 96e8601b9d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 64 additions and 0 deletions

View File

@ -0,0 +1,16 @@
diff --git a/dtnetsubs.c b/dtnetsubs.c
index ad1c30d..c1fda9b 100644
--- a/dtnetsubs.c
+++ b/dtnetsubs.c
@@ -865,10 +865,7 @@ int dtSend (NetFet *fet, const void *buf, int len)
** Update the IN pointer, then wake the send thread.
*/
fet->sendin = in;
- if (ssemp (fet) != NULL)
- {
- sem_post (ssemp (fet));
- }
+ sem_post (ssemp (fet));
if (dtSendFree (fet) == 0)
{

View File

@ -0,0 +1,48 @@
{ lib
, stdenv
, fetchurl
, libsndfile
, wxGTK32
, SDL
}:
stdenv.mkDerivation rec {
pname = "pterm";
version = "6.0.4";
buildInputs = [ libsndfile SDL wxGTK32 ];
src = fetchurl {
url = "https://www.cyber1.org/download/linux/pterm-${version}.tar.bz2";
hash = "sha256-0OJvoCOGx/a51Ja7n3fOTeQJEcdyn/GhaJ0NtVCyuC8=";
};
patches = [ ./0001-dtnetsubs-remove-null-check.patch ];
preBuild = ''
substituteInPlace Makefile.common Makefile.wxpterm --replace "/bin/echo" "echo"
echo "exit 0" > wxversion.py
'';
hardeningDisable = [ "format" ];
env.PTERMVERSION = "${version}";
installPhase = ''
runHook preInstall
install -Dm755 "pterm" "$out/bin/pterm"
runHook postInstall
'';
meta = with lib; {
description = "terminal emulator for the Cyber1 mainframe-based CYBIS system";
homepage = "https://www.cyber1.org/";
license = licenses.zlib;
maintainers = with maintainers; [ sarcasticadmin ];
mainProgram = "pterm";
platforms = platforms.unix;
broken = stdenv.isDarwin;
};
}