From 327d19b7fd3a469ec223d74bd62895b14176cc42 Mon Sep 17 00:00:00 2001 From: jacobi petrucciani Date: Thu, 23 Jan 2025 17:19:49 -0500 Subject: [PATCH] fix mdctl builds on darwin --- mods/pkgs/mdctl-alpha/default.nix | 4 ++-- mods/pkgs/mdctl/default.nix | 4 ++-- pins/jpetrucciani.json | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/mods/pkgs/mdctl-alpha/default.nix b/mods/pkgs/mdctl-alpha/default.nix index c73dacf..e58244c 100644 --- a/mods/pkgs/mdctl-alpha/default.nix +++ b/mods/pkgs/mdctl-alpha/default.nix @@ -1,8 +1,8 @@ -{ pkgs ? import { }, nodejs ? pkgs.nodejs_20 }: +{ pkgs ? import { }, nodejs ? pkgs.nodejs_22 }: with pkgs; with lib; with builtins; let yarn2nix = yarn2nix-moretea.override { inherit nodejs; }; - osSpecific = with pkgs.darwin.apple_sdk.frameworks; if pkgs.stdenv.isDarwin then [ Security AppKit xcbuild ] else [ ]; + osSpecific = with pkgs.darwin.apple_sdk.frameworks; if pkgs.stdenv.isDarwin then [ Security AppKit xcbuild darwin.cctools ] else [ ]; json = fromJSON (readFile ./package.json); pname = replaceStrings [ "@" "/" ] [ "" "-" ] (head (attrNames json.dependencies)); version = head (attrValues json.dependencies); diff --git a/mods/pkgs/mdctl/default.nix b/mods/pkgs/mdctl/default.nix index c73dacf..e58244c 100644 --- a/mods/pkgs/mdctl/default.nix +++ b/mods/pkgs/mdctl/default.nix @@ -1,8 +1,8 @@ -{ pkgs ? import { }, nodejs ? pkgs.nodejs_20 }: +{ pkgs ? import { }, nodejs ? pkgs.nodejs_22 }: with pkgs; with lib; with builtins; let yarn2nix = yarn2nix-moretea.override { inherit nodejs; }; - osSpecific = with pkgs.darwin.apple_sdk.frameworks; if pkgs.stdenv.isDarwin then [ Security AppKit xcbuild ] else [ ]; + osSpecific = with pkgs.darwin.apple_sdk.frameworks; if pkgs.stdenv.isDarwin then [ Security AppKit xcbuild darwin.cctools ] else [ ]; json = fromJSON (readFile ./package.json); pname = replaceStrings [ "@" "/" ] [ "" "-" ] (head (attrNames json.dependencies)); version = head (attrValues json.dependencies); diff --git a/pins/jpetrucciani.json b/pins/jpetrucciani.json index 3e9c408..08c6b1b 100644 --- a/pins/jpetrucciani.json +++ b/pins/jpetrucciani.json @@ -1,5 +1,5 @@ { "date": "2025-01-23", - "rev": "fde3e768e7990b4ab54e988c4ac8429d7c661ef2", - "sha256": "0szidhiq6xqphi3jadzs1mhkwid60c51yhd615vbxscdcjv5nhwp" + "rev": "b4ce5d3cb5d030723ce69b00aee77ff8203df21a", + "sha256": "1k7z653g5dhz5k5l9sv5nz33srxsfznd03975hb7d7hfxhrxz4vl" }