nordic-dev.net/nixpkgs
nordic-dev.net/nixpkgs
2
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-11-28 09:53:10 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #128072 from oxalica/vscode-lldb

Browse Source
This commit is contained in:
Sandro 2021-06-25 15:42:23 +02:00 committed by GitHub
commit 4399e70e73
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 14 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pkgs/development/node-packages/node-packages.nix generated
View File

@ -114043,7 +114043,7 @@ in
"vscode-lldb-build-deps-../../misc/vscode-extensions/vscode-lldb/build-deps" = nodeEnv.buildNodePackage {
name = "vscode-lldb";
packageName = "vscode-lldb";
version = "1.6.4";
version = "1.6.5";
src = ../../misc/vscode-extensions/vscode-lldb/build-deps;
dependencies = [
sources."@discoveryjs/json-ext-0.5.3"

2
pkgs/misc/vscode-extensions/vscode-lldb/build-deps/package.json
View File

@ -1,6 +1,6 @@
{
"name": "vscode-lldb",
"version": "1.6.4",
"version": "1.6.5",
"dependencies": {
"string-argv": "^0.3.1",
"yaml": "^1.10.0",

16
pkgs/misc/vscode-extensions/vscode-lldb/default.nix
View File

@ -5,13 +5,15 @@ assert lib.versionAtLeast python3.version "3.5";
let
publisher = "vadimcn";
pname = "vscode-lldb";
version = "1.6.4";
version = "1.6.5";
vscodeExtUniqueId = "${publisher}.${pname}";
src = fetchFromGitHub {
owner = "vadimcn";
repo = "vscode-lldb";
rev = "v${version}";
sha256 = "sha256-utElXMAJG8X7jFmY/oyrWOCkOiNG3jZHrf04vTBTi7M=";
sha256 = "sha256-ppiEWFKJiUtlF8LSqBb8Xvg26B+wHcIZJhU+ANE4J2k=";
};
lldb = callPackage ./lldb.nix {};
@ -23,7 +25,7 @@ let
# It will pollute the build environment of `buildRustPackage`.
cargoPatches = [ ./reset-cargo-config.patch ];
cargoSha256 = "sha256-ZbD/+QWvpi88bHoSvDG0FKcsTsnthYR1SYkkJhqBbbU=";
cargoSha256 = "sha256-ksRFlbtrFAbcX/Pc6rgWUHVl859GVUOvNckxM7Q971U=";
nativeBuildInputs = [ makeWrapper ];
@ -41,10 +43,10 @@ let
nodeDeps = nodePackages."vscode-lldb-build-deps-../../misc/vscode-extensions/vscode-lldb/build-deps";
in stdenv.mkDerivation rec {
name = "vscode-extension-${pname}";
inherit src;
vscodeExtUniqueId = "${publisher}.${pname}";
in stdenv.mkDerivation {
pname = "vscode-extension-${publisher}-${pname}";
inherit src version vscodeExtUniqueId;
installPrefix = "share/vscode/extensions/${vscodeExtUniqueId}";
nativeBuildInputs = [ cmake nodejs unzip makeWrapper ];

3
pkgs/misc/vscode-extensions/vscode-lldb/update.sh
View File

@ -30,6 +30,9 @@ jq '{ name, version: $version, dependencies: (.dependencies + .devDependencies)
"$src/package.json" \
> build-deps/package.json
# FIXME: vsce@1.93.0 breaks the build.
sed 's/"vsce": ".*"/"vsce": "=1.88.0"/' --in-place build-deps/package.json
# Regenerate nodePackages.
cd "$nixpkgs/pkgs/development/node-packages"
exec ./generate.sh