Skip to content

Fix #724. build: Add darwin aarch64 to supported architectures #743

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Feb 4, 2024
Merged

Fix #724. build: Add darwin aarch64 to supported architectures #743

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
f5d3c49
build: Add darwin aarch64 to supported architectures
ljrk0 Feb 4, 2024
5df141e
fix: correct pagesize in dependency simg2img
ljrk0 Feb 4, 2024
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 flake.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@
outputs = { self, nixpkgs, filter, unblob-native, lzallright, pyperscan, sasquatch, ... }:
let
# System types to support.
supportedSystems = [ "x86_64-linux" "aarch64-linux" "x86_64-darwin" ];
supportedSystems = [ "x86_64-linux" "aarch64-linux" "x86_64-darwin" "aarch64-darwin" ];

# Helper function to generate an attrset '{ x86_64-linux = f "x86_64-linux"; ... }'.
forAllSystems = nixpkgs.lib.genAttrs supportedSystems;
Expand Down
9 changes: 9 additions & 0 deletions overlay.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,15 @@ final: prev:
nativeCheckInputs = (super.nativeCheckInputs or [ ]) ++ [ final.which ];
});

simg2img = prev.simg2img.overrideAttrs (super: {
postPatch = ''
substituteInPlace output_file.cpp \
--replace-fail \
'aligned_offset = offset & ~(4096 - 1);' \
'aligned_offset = offset & ~(sysconf(_SC_PAGESIZE) - 1);'
'';
});

# Own package updated independently of nixpkgs
jefferson = final.callPackage ./nix/jefferson { };

Expand Down