b12f/nixpkgs
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

nodePackages: remove usage of xcbuild

Browse source
This commit is contained in:
Lily Foster 2022-09-30 14:30:34 -04:00 committed by Yt
parent 2998b31b02
commit 688211615f
1 changed files with 4 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
pkgs/development/node-packages/overrides.nix
View file

@ -96,13 +96,13 @@ final: prev: {
nativeBuildInputs = with pkgs; [
pkg-config
] ++ lib.optionals stdenv.isDarwin [
xcbuild
darwin.apple_sdk.frameworks.CoreText
];
buildInputs = with pkgs; [
pixman
cairo
pango
giflib
];
};
@ -147,14 +147,13 @@ 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 ] ++ lib.optionals stdenv.isDarwin [ pkgs.xcbuild ];
nativeBuildInputs = [ final.node-pre-gyp final.node-gyp-build pkgs.which ];
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; };
});
@ -222,11 +221,7 @@ final: prev: {
});
joplin = prev.joplin.override {
nativeBuildInputs = with pkgs; [
pkg-config
] ++ lib.optionals stdenv.isDarwin [
xcbuild
];
nativeBuildInputs = [ pkgs.pkg-config ];
buildInputs = with pkgs; [
# required by sharp
# https://sharp.pixelplumbing.com/install
@ -292,10 +287,6 @@ 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 {}
@ -513,11 +504,7 @@ final: prev: {
};
thelounge-plugin-giphy = prev.thelounge-plugin-giphy.override {
nativeBuildInputs = [
final.node-pre-gyp
] ++ lib.optionals stdenv.isDarwin [
pkgs.xcbuild
];
nativeBuildInputs = [ final.node-pre-gyp ];
};
thelounge-theme-flat-blue = prev.thelounge-theme-flat-blue.override {