Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -21,4 +21,4 @@
*.d
host/funcheck
/.vscode
/.vscode/*
/.vscode/*
10 changes: 6 additions & 4 deletions flake.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

74 changes: 41 additions & 33 deletions flake.nix
Original file line number Diff line number Diff line change
Expand Up @@ -5,53 +5,60 @@
flake-utils.url = "github:numtide/flake-utils";
};

outputs = {
self,
nixpkgs,
flake-utils,
}:
outputs =
{
self,
nixpkgs,
flake-utils,
}:
flake-utils.lib.eachDefaultSystem (
system: let
system:
let
pkgs = nixpkgs.legacyPackages.${system};
llvm = pkgs.llvm_18;
commit =
if self ? rev then builtins.substring 0 12 self.rev
else if self ? dirtyRev then builtins.substring 0 12 (pkgs.lib.removeSuffix "-dirty" self.dirtyRev)
else "1.1.4";
commit =
if self ? rev then
builtins.substring 0 12 self.rev
else if self ? dirtyRev then
builtins.substring 0 12 (pkgs.lib.removeSuffix "-dirty" self.dirtyRev)
else
"1.1.4";
funcheck_drv = pkgs.stdenv.mkDerivation (final: {
pname = "funcheck";
version = commit;
src = ./.;
patches = [
(
builtins.toFile
"remove_fwrite_unlocked.patch"
''
diff --git a/library/srcs/hook/functions/stdio.c b/library/srcs/hook/functions/stdio.c
index dbb9e2a..2d6b9dd 100644
--- a/library/srcs/hook/functions/stdio.c
+++ b/library/srcs/hook/functions/stdio.c
@@ -104,7 +104,7 @@ DEFINE_HOOK_FUNCTION(size_t, fwrite, EIO, 0, const void *, ptr, size_t, size, si
(builtins.toFile "remove_fwrite_unlocked.patch" ''
diff --git a/library/srcs/hook/functions/stdio.c b/library/srcs/hook/functions/stdio.c
index dbb9e2a..2d6b9dd 100644
--- a/library/srcs/hook/functions/stdio.c
+++ b/library/srcs/hook/functions/stdio.c
@@ -104,7 +104,7 @@ DEFINE_HOOK_FUNCTION(size_t, fwrite, EIO, 0, const void *, ptr, size_t, size, si

DEFINE_HOOK_FUNCTION(int, fputs_unlocked, EIO, 0, const char *, s, FILE *, stream);
DEFINE_HOOK_FUNCTION(size_t, fread_unlocked, EIO, 0, void *, ptr, size_t, size, size_t, nmemb, FILE *, stream);
-DEFINE_HOOK_FUNCTION(size_t, fwrite_unlocked, EIO, 0, const void *, ptr, size_t, size, size_t, nmemb, FILE *, stream);
+//DEFINE_HOOK_FUNCTION(size_t, fwrite_unlocked, EIO, 0, const void *, ptr, size_t, size, size_t, nmemb, FILE *, stream);
DEFINE_HOOK_FUNCTION(int, fputs_unlocked, EIO, 0, const char *, s, FILE *, stream);
DEFINE_HOOK_FUNCTION(size_t, fread_unlocked, EIO, 0, void *, ptr, size_t, size, size_t, nmemb, FILE *, stream);
-DEFINE_HOOK_FUNCTION(size_t, fwrite_unlocked, EIO, 0, const void *, ptr, size_t, size, size_t, nmemb, FILE *, stream);
+//DEFINE_HOOK_FUNCTION(size_t, fwrite_unlocked, EIO, 0, const void *, ptr, size_t, size, size_t, nmemb, FILE *, stream);

DEFINE_HOOK_FUNCTION(int, fseek, EIO, -1, FILE *, stream, long, offset, int, whence);
DEFINE_HOOK_FUNCTION(long, ftell, EIO, -1, FILE *, stream);
DEFINE_HOOK_FUNCTION(int, fseek, EIO, -1, FILE *, stream, long, offset, int, whence);
DEFINE_HOOK_FUNCTION(long, ftell, EIO, -1, FILE *, stream);

''
)
'')
];
nativeBuildInputs = [pkgs.makeWrapper pkgs.minilibx pkgs.gnumake pkgs.xorg.libX11];
buildInputs = [llvm];
nativeBuildInputs = with pkgs; [
makeWrapper
minilibx
gnumake
libX11
];
buildInputs = [ llvm ];
buildPhase = ''
ls -la
export CFLAGS="-Werror -Wextra -Wall -Wno-stringop-truncation \
-Wno-attributes -Wno-array-parameter -Wno-unused-result \
-Wno-implicit-function-declaration -Wno-int-conversion \
-DABSOLUTE_LIBRARY_PATH=\\\"$out/share/funcheck/libfuncheck.so\\\" \
-g -fPIC -fvisibility=hidden"
-g -fPIC -fvisibility=hidden -Wno-deprecated-declarations -std=gnu99"
make -C library "CC=$CC" "CFLAGS=$CFLAGS" "VERSION=${final.version}"
make -C host "CC=$CC" "CFLAGS=$CFLAGS" "VERSION=${final.version}"
'';
Expand All @@ -61,16 +68,17 @@
cp ./host/funcheck "$out/bin/funcheck"
cp ./library/libfuncheck.so "$out/share/funcheck/libfuncheck.so"
wrapProgram $out/bin/funcheck \
--prefix PATH : ${pkgs.lib.makeBinPath [llvm]}
--prefix PATH : ${pkgs.lib.makeBinPath [ llvm ]}
'';
});
in {
in
{
packages = rec {
funcheck = default;
default = funcheck_drv;
};
apps = rec {
funcheck = flake-utils.lib.mkApp {drv = self.packages.${system}.funcheck;};
funcheck = flake-utils.lib.mkApp { drv = self.packages.${system}.funcheck; };
default = funcheck;
};
}
Expand Down
Loading