diff options
author | Lily Foster <lily@lily.flowers> | 2022-09-29 11:29:32 -0400 |
---|---|---|
committer | Yt <happysalada@proton.me> | 2022-10-01 00:46:46 +0900 |
commit | dc642a941264f9a234b259d5fe87b394ec24813b (patch) | |
tree | 1a5b2c17237efbd66cd13885d8fbffbf042c87eb /pkgs/development/node-packages | |
parent | b881869205e82652b4c5ce7ebff3b3fea5a4817b (diff) |
nodePackages: fix builds on x86_64-darwin
Follow-up to #193337 to fix several x86_64-darwin build failures due to missing xcrun/xcodebuild
Diffstat (limited to 'pkgs/development/node-packages')
-rw-r--r-- | pkgs/development/node-packages/overrides.nix | 32 |
1 files changed, 27 insertions, 5 deletions
diff --git a/pkgs/development/node-packages/overrides.nix b/pkgs/development/node-packages/overrides.nix index ee5527fa97fb1..7c5a408706e4e 100644 --- a/pkgs/development/node-packages/overrides.nix +++ b/pkgs/development/node-packages/overrides.nix @@ -93,8 +93,17 @@ final: prev: { bitwarden-cli = prev."@bitwarden/cli".override { name = "bitwarden-cli"; - nativeBuildInputs = [ pkgs.pkg-config ]; - buildInputs = with pkgs; [ pixman cairo pango ]; + nativeBuildInputs = with pkgs; [ + pkg-config + ] ++ lib.optionals stdenv.isDarwin [ + xcbuild + darwin.apple_sdk.frameworks.CoreText + ]; + buildInputs = with pkgs; [ + pixman + cairo + pango + ]; }; bower2nix = prev.bower2nix.override { @@ -138,13 +147,14 @@ final: prev: { # ../../applications/video/epgstation epgstation = prev."epgstation-../../applications/video/epgstation".override (oldAttrs: { buildInputs = [ pkgs.postgresql ]; - nativeBuildInputs = [ final.node-pre-gyp final.node-gyp-build pkgs.which ]; + nativeBuildInputs = [ final.node-pre-gyp final.node-gyp-build pkgs.which ] ++ lib.optionals stdenv.isDarwin [ pkgs.xcbuild ]; meta = oldAttrs.meta // { platforms = lib.platforms.none; }; }); # NOTE: this is a stub package to fetch npm dependencies for # ../../applications/video/epgstation/client epgstation-client = prev."epgstation-client-../../applications/video/epgstation/client".override (oldAttrs: { + nativeBuildInputs = lib.optionals stdenv.isDarwin [ pkgs.xcbuild ]; meta = oldAttrs.meta // { platforms = lib.platforms.none; }; }); @@ -212,7 +222,11 @@ final: prev: { }); joplin = prev.joplin.override { - nativeBuildInputs = [ pkgs.pkg-config ]; + nativeBuildInputs = with pkgs; [ + pkg-config + ] ++ lib.optionals stdenv.isDarwin [ + xcbuild + ]; buildInputs = with pkgs; [ # required by sharp # https://sharp.pixelplumbing.com/install @@ -278,6 +292,10 @@ final: prev: { ''; }; + mastodon-bot = prev.mastodon-bot.override { + nativeBuildInputs = lib.optionals stdenv.isDarwin [ pkgs.xcbuild ]; + }; + mermaid-cli = prev."@mermaid-js/mermaid-cli".override ( if stdenv.isDarwin then {} @@ -495,7 +513,11 @@ final: prev: { }; thelounge-plugin-giphy = prev.thelounge-plugin-giphy.override { - nativeBuildInputs = [ final.node-pre-gyp ]; + nativeBuildInputs = [ + final.node-pre-gyp + ] ++ lib.optionals stdenv.isDarwin [ + pkgs.xcbuild + ]; }; thelounge-theme-flat-blue = prev.thelounge-theme-flat-blue.override { |