This commit is contained in:
mjallen18
2025-12-11 19:14:52 -06:00
parent 31202f8b0e
commit 8d1a9312cb
13 changed files with 64 additions and 37 deletions

View File

@@ -4,8 +4,12 @@
lib,
callPackage,
zfs_2_3,
# 1. Add 'inputs' generic argument (passed by Snowfall Lib)
inputs ? { },
# 2. Make 'self' optional, defaulting to inputs.self (handles both Overlay and Snowfall cases)
self ? inputs.self,
...
}@inputs:
}@args: # 3. Rename this capture from 'inputs' to 'args' to avoid variable name collision
let
inherit (stdenv) isx86_64 isLinux;
@@ -21,10 +25,11 @@ let
taste = "linux-cachyos";
configPath = ./config-nix/cachyos-lto.x86_64-linux.nix;
inherit (import ./lib/llvm-pkgs.nix inputs) callPackage;
# Pass the unified arguments (including the resolved 'self') to llvm-pkgs
inherit (import ./lib/llvm-pkgs.nix (args // { inherit self; })) callPackage;
useLTO = "thin";
packagesExtend = import ./lib/llvm-module-overlay.nix inputs;
packagesExtend = import ./lib/llvm-module-overlay.nix args;
zfsOverride = {
inherit (pkgs)
@@ -75,7 +80,7 @@ let
}
else
{
callPackage ? inputs.callPackage,
callPackage ? args.callPackage,
...
}@attrs:
callPackage ./packages-for.nix (
@@ -175,4 +180,4 @@ in
};
postPatch = builtins.replaceStrings [ "grep --quiet '^Linux-M" ] [ "# " ] prevAttrs.postPatch;
});
}
}