voidlizard
/
hbs2
mirror of https://github.com/voidlizard/hbs2
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

possible mac unix socket fix, static build fix

This commit is contained in:
voidlizard 2025-02-09 16:27:49 +03:00
parent 7b30dddbe8
commit 826f64f2d2
2 changed files with 10 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
flake.nix
View File

@ -58,6 +58,15 @@ outputs = { self, nixpkgs, flake-utils, ... }@inputs:
scotty = new.callHackage "scotty" "0.21" {}; scotty = new.callHackage "scotty" "0.21" {};
skylighting-lucid = new.callHackage "skylighting-lucid" "1.0.4" { }; skylighting-lucid = new.callHackage "skylighting-lucid" "1.0.4" { };
wai-app-file-cgi = dontCoverage (dontCheck (jailbreakUnbreak pkgs old.wai-app-file-cgi)); 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: overrideComposable = pkgs: hpkgs: overrides:

2
hbs2-core/lib/HBS2/Net/Messaging/Unix.hs
View File

@ -166,7 +166,7 @@ runMessagingUnix env = do
let openSock = liftIO $ socket AF_UNIX Stream defaultProtocol let openSock = liftIO $ socket AF_UNIX Stream defaultProtocol
let closeSock = liftIO . close let closeSock = liftIO . close
touch (msgUnixSockPath env) -- touch (msgUnixSockPath env)
sock <- ContT $ bracket openSock closeSock sock <- ContT $ bracket openSock closeSock