ilyakooo0/nixpkgs
1
0
Fork 0
mirror of https://github.com/ilyakooo0/nixpkgs.git synced 2024-10-06 04:27:27 +03:00
Code Issues Projects Releases Wiki Activity

Merge pull request #323027 from zeorin/fix-vscode-js-debug-darwin

Browse Source 
vscode-js-debug: darwin support
This commit is contained in:
Aleksana 2024-06-28 20:56:16 +08:00 committed by GitHub
commit f7b841a447
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 18 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
pkgs/by-name/vs/vscode-js-debug/package.nix
View File

@ -1,8 +1,12 @@
{ lib
, stdenv
, buildNpmPackage
, fetchFromGitHub
, buildPackages
, libsecret
, xcbuild
, Security
, AppKit
, pkg-config
, nodePackages
, runCommand
@ -23,9 +27,17 @@ buildNpmPackage rec {
npmDepsHash = "sha256-DfeaiqKadTnGzOObK01ctlavwqTMa0tqn59sLZMPvUM=";
nativeBuildInputs = [ pkg-config nodePackages.node-gyp ];
nativeBuildInputs = [
pkg-config
nodePackages.node-gyp
] ++ lib.optionals stdenv.isDarwin [ xcbuild ];
buildInputs = [ libsecret ];
buildInputs =
lib.optionals (!stdenv.isDarwin) [ libsecret ]
++ lib.optionals stdenv.isDarwin [
Security
AppKit
];
postPatch = ''
${lib.getExe buildPackages.jq} '

4
pkgs/top-level/all-packages.nix
View File

@ -35086,6 +35086,10 @@ with pkgs;
vscode-extensions = recurseIntoAttrs (callPackage ../applications/editors/vscode/extensions { });
vscode-js-debug = callPackage ../by-name/vs/vscode-js-debug/package.nix {
inherit (darwin.apple_sdk.frameworks) AppKit Security;
};
vscodium = callPackage ../applications/editors/vscode/vscodium.nix { };
vscodium-fhs = vscodium.fhs;
vscodium-fhsWithPackages = vscodium.fhsWithPackages;