From 826f64f2d2a415c15a22aa5c915109e2d6e10cc2 Mon Sep 17 00:00:00 2001 From: voidlizard Date: Sun, 9 Feb 2025 16:27:49 +0300 Subject: [PATCH] possible mac unix socket fix, static build fix --- flake.nix | 9 +++++++++ hbs2-core/lib/HBS2/Net/Messaging/Unix.hs | 2 +- 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/flake.nix b/flake.nix index 9f68c7f5..4524f2c0 100644 --- a/flake.nix +++ b/flake.nix @@ -58,6 +58,15 @@ outputs = { self, nixpkgs, flake-utils, ... }@inputs: scotty = new.callHackage "scotty" "0.21" {}; skylighting-lucid = new.callHackage "skylighting-lucid" "1.0.4" { }; wai-app-file-cgi = dontCoverage (dontCheck (jailbreakUnbreak pkgs old.wai-app-file-cgi)); + libyaml = + if pkgs.hostPlatform.isStatic + then old.libyaml.overrideDerivation (drv: { + postPatch = let sed = "${pkgs.gnused}/bin/sed"; in '' + ${sed} -i -e 's/buffer_init/snoyberg_buffer_init/' c/helper.c include/helper.h + ${sed} -i -e 's/"buffer_init"/"snoyberg_buffer_init"/' src/Text/Libyaml.hs + ''; + }) + else old.libyaml; }; overrideComposable = pkgs: hpkgs: overrides: diff --git a/hbs2-core/lib/HBS2/Net/Messaging/Unix.hs b/hbs2-core/lib/HBS2/Net/Messaging/Unix.hs index b2cf49bb..7ce1e97c 100644 --- a/hbs2-core/lib/HBS2/Net/Messaging/Unix.hs +++ b/hbs2-core/lib/HBS2/Net/Messaging/Unix.hs @@ -166,7 +166,7 @@ runMessagingUnix env = do let openSock = liftIO $ socket AF_UNIX Stream defaultProtocol let closeSock = liftIO . close - touch (msgUnixSockPath env) + -- touch (msgUnixSockPath env) sock <- ContT $ bracket openSock closeSock