michael/nix-dots
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

fix(darwin): resolve nodejs-related build issues

Browse Source
This commit is contained in:
Michael Thomas 2025-05-17 15:57:48 -04:00
parent b4cd8edacd
commit 0e7b17b468
3 changed files with 14 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
darwin/sketchybar/default.nix
View File

@ -16,7 +16,7 @@ in {
hm.my.sketchybar.enable = true; hm.my.sketchybar.enable = true;
fonts.packages = with pkgs; [ fonts.packages = with pkgs; [
sketchybar-app-font unstable.sketchybar-app-font
]; ];
}; };
} }

22
overlays/default.nix
View File

@ -1,7 +1,4 @@
{inputs, ...}: { {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 # This one brings our custom packages from the 'pkgs' directory
additions = final: prev: additions = final: prev:
{ {
@ -17,13 +14,18 @@
# This one contains whatever you want to overlay # This one contains whatever you want to overlay
# You can change versions, add patches, set compilation flags, anything really. # You can change versions, add patches, set compilation flags, anything really.
# https://nixos.wiki/wiki/Overlays # https://nixos.wiki/wiki/Overlays
modifications = final: prev: modifications = final: prev: {
if prev.stdenv.isDarwin # address build failure on darwin, remove after 25.05
then { nodejs_20-slim = prev.nodejs-slim_22;
# avoid build failure on darwin nodejs_20 = prev.nodejs_22;
inherit (final.unstable) ghostscript; nodejs-slim = prev.nodejs-slim_22;
} nodejs = prev.nodejs_22;
else {}; };
# 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 # When applied, the unstable nixpkgs set (declared in the flake inputs) will
# be accessible through 'pkgs.unstable' # be accessible through 'pkgs.unstable'

2
pkgs/nvim/default.nix
View File

@ -8,7 +8,7 @@
icons = import ./config/icons.nix; icons = import ./config/icons.nix;
pkgsMaster = inputs.master.legacyPackages.${system}; pkgsMaster = inputs.master.legacyPackages.${system};
nixvimModule = { nixvimModule = {
pkgs = inputs.nixpkgs.legacyPackages.${system}; inherit pkgs;
module = import ./config; module = import ./config;
extraSpecialArgs = {inherit icons pkgsMaster;}; extraSpecialArgs = {inherit icons pkgsMaster;};
}; };