fix: flake.nix (#7224)

Signed-off-by: Tyler Hardin <th020394@gmail.com>
This commit is contained in:
Tyler 2026-03-07 12:16:19 -05:00 committed by GitHub
parent a7fb7e199c
commit 01804dfa89
No known key found for this signature in database
GPG key ID: B5690EEEBB952194

View file

@ -42,17 +42,42 @@
version = workspaceToml.workspace.package.version; version = workspaceToml.workspace.package.version;
src = self; src = self;
cargoLock = { cargoLock.lockFile = ./Cargo.lock;
lockFile = ./Cargo.lock;
LIBCLANG_PATH = "${pkgs.libclang.lib}/lib";
# Pre-fetch rusty_v8 binary to avoid network access during build
# Map Nix system to rusty_v8 target triple
RUSTY_V8_ARCHIVE = let
cargoLock = builtins.fromTOML (builtins.readFile ./Cargo.lock);
rustyV8Version = (builtins.head (builtins.filter (p: p.name == "v8") cargoLock.package)).version;
rustyV8Target = {
"x86_64-linux" = "x86_64-unknown-linux-gnu";
"aarch64-linux" = "aarch64-unknown-linux-gnu";
"x86_64-darwin" = "x86_64-apple-darwin";
"aarch64-darwin" = "aarch64-apple-darwin";
}.${system} or (throw "Unsupported system: ${system}");
rustyV8Sha256 = {
"x86_64-linux" = "sha256-chV1PAx40UH3Ute5k3lLrgfhih39Rm3KqE+mTna6ysE=";
"aarch64-linux" = "sha256-4IivYskhUSsMLZY97+g23UtUYh4p5jk7CzhMbMyqXyY=";
"x86_64-darwin" = "sha256-1jUuC+z7saQfPYILNyRJanD4+zOOhXU2ac/LFoytwho=";
"aarch64-darwin" = "sha256-yHa1eydVCrfYGgrZANbzgmmf25p7ui1VMas2A7BhG6k=";
}.${system};
in pkgs.fetchurl {
url = "https://github.com/denoland/rusty_v8/releases/download/v${rustyV8Version}/librusty_v8_release_${rustyV8Target}.a.gz";
sha256 = rustyV8Sha256;
}; };
nativeBuildInputs = with pkgs; [ nativeBuildInputs = with pkgs; [
pkg-config pkg-config
clang
cmake
]; ];
buildInputs = with pkgs; [ buildInputs = with pkgs; [
openssl openssl
xorg.libxcb # Required for xcap screenshot functionality cacert # CA certificates for tests
libxcb # Required for xcap screenshot functionality
dbus # Required for system integration features dbus # Required for system integration features
] ++ pkgs.lib.optionals pkgs.stdenv.isDarwin darwinInputs; ] ++ pkgs.lib.optionals pkgs.stdenv.isDarwin darwinInputs;
@ -82,7 +107,7 @@
}; };
}; };
devShell = pkgs.mkShell { devShells.default = pkgs.mkShell {
packages = buildInputs ++ (with pkgs; [ packages = buildInputs ++ (with pkgs; [
cargo-watch cargo-watch
cargo-edit cargo-edit
@ -93,7 +118,7 @@
nodejs_24 # 'just' run-ui nodejs_24 # 'just' run-ui
ripgrep ripgrep
rustfmt rustfmt
xorg.libxcb libxcb
dbus dbus
yarn # 'just' install-deps yarn # 'just' install-deps
]); ]);