fix(darwin): resolve nodejs-related build issues
This commit is contained in:
parent
b4cd8edacd
commit
0e7b17b468
@ -16,7 +16,7 @@ in {
|
||||
hm.my.sketchybar.enable = true;
|
||||
|
||||
fonts.packages = with pkgs; [
|
||||
sketchybar-app-font
|
||||
unstable.sketchybar-app-font
|
||||
];
|
||||
};
|
||||
}
|
||||
|
@ -1,7 +1,4 @@
|
||||
{inputs, ...}: {
|
||||
rust-overlay = inputs.rust-overlay.overlays.default;
|
||||
vscode-extensions = inputs.nix-vscode-extensions.overlays.default;
|
||||
|
||||
# This one brings our custom packages from the 'pkgs' directory
|
||||
additions = final: prev:
|
||||
{
|
||||
@ -17,13 +14,18 @@
|
||||
# This one contains whatever you want to overlay
|
||||
# You can change versions, add patches, set compilation flags, anything really.
|
||||
# https://nixos.wiki/wiki/Overlays
|
||||
modifications = final: prev:
|
||||
if prev.stdenv.isDarwin
|
||||
then {
|
||||
# avoid build failure on darwin
|
||||
inherit (final.unstable) ghostscript;
|
||||
}
|
||||
else {};
|
||||
modifications = final: prev: {
|
||||
# address build failure on darwin, remove after 25.05
|
||||
nodejs_20-slim = prev.nodejs-slim_22;
|
||||
nodejs_20 = prev.nodejs_22;
|
||||
nodejs-slim = prev.nodejs-slim_22;
|
||||
nodejs = prev.nodejs_22;
|
||||
};
|
||||
|
||||
# External overlays
|
||||
# Included after the above to ensure modifications are applied
|
||||
rust-overlay = inputs.rust-overlay.overlays.default;
|
||||
vscode-extensions = inputs.nix-vscode-extensions.overlays.default;
|
||||
|
||||
# When applied, the unstable nixpkgs set (declared in the flake inputs) will
|
||||
# be accessible through 'pkgs.unstable'
|
||||
|
@ -8,7 +8,7 @@
|
||||
icons = import ./config/icons.nix;
|
||||
pkgsMaster = inputs.master.legacyPackages.${system};
|
||||
nixvimModule = {
|
||||
pkgs = inputs.nixpkgs.legacyPackages.${system};
|
||||
inherit pkgs;
|
||||
module = import ./config;
|
||||
extraSpecialArgs = {inherit icons pkgsMaster;};
|
||||
};
|
||||
|
Loading…
x
Reference in New Issue
Block a user