vscode-extensions.vadimcn.vscode-lldb: use "buildNpmPackage" instead of "node2nix" (7f2dad03) · Commits · nix / nixpkgs

pkgs/applications/editors/vscode/extensions/vadimcn.vscode-lldb/build-deps/default.nix

deleted100644 → 0

+0 −17

Original line number	Diff line number	Diff line
		# This file has been generated by node2nix 1.11.1. Do not edit!

		{pkgs ? import <nixpkgs> {
		inherit system;
		}, system ? builtins.currentSystem, nodejs ? pkgs."nodejs_14"}:

		let
		nodeEnv = import ./node-env.nix {
		inherit (pkgs) stdenv lib python2 runCommand writeTextFile writeShellScript;
		inherit pkgs nodejs;
		libtool = if pkgs.stdenv.isDarwin then pkgs.darwin.cctools else null;
		};
		in
		import ./node-packages.nix {
		inherit (pkgs) fetchurl nix-gitignore stdenv lib fetchgit;
		inherit nodeEnv;
		}

deleted100644 → 0

+0 −598

File deleted.

Preview size limit exceeded, changes collapsed.

deleted100644 → 0

+0 −3201

File deleted.

Preview size limit exceeded, changes collapsed.

+28 −11

Original line number	Diff line number	Diff line
		{ pkgs, lib, stdenv, fetchFromGitHub, runCommand, rustPlatform, makeWrapper, llvmPackages
		, nodePackages, cmake, nodejs, unzip, python3, pkg-config, libsecret
		, buildNpmPackage, cmake, nodejs, unzip, python3, pkg-config, libsecret
		}:
		assert lib.versionAtLeast python3.version "3.5";
		let
		@@ -42,15 +42,32 @@ let
		doCheck = false;
		};

		nodeDeps = ((import ./build-deps/default.nix {
		inherit pkgs nodejs;
		inherit (stdenv.hostPlatform) system;
		}).nodeDependencies.override (old: {
		inherit src version;
		nativeBuildInputs = [ pkg-config ];
		buildInputs = [libsecret];
		dontNpmInstall = true;
		}));
		nodeDeps = buildNpmPackage {
		pname = "${pname}-node-deps";
		inherit version src;

		npmDepsHash = "sha256-+LXcY3sQjZa9DyBiUK1G4BnAr6c+1ZkHMPCCSPWIDtA=";

		nativeBuildInputs = [
		python3
		pkg-config
		];

		buildInputs = [
		libsecret
		];

		dontNpmBuild = true;

		installPhase = ''
		runHook preInstall

		mkdir -p $out/lib
		cp -r node_modules $out/lib

		runHook postInstall
		'';
		};

		in stdenv.mkDerivation {
		pname = "vscode-extension-${publisher}-${pname}";
		@@ -63,7 +80,7 @@ in stdenv.mkDerivation {
		patches = [ ./cmake-build-extension-only.patch ];

		postConfigure = ''
		cp -r ${nodeDeps}/lib/{node_modules,package-lock.json} .
		cp -r ${nodeDeps}/lib/node_modules .
		'';

		cmakeFlags = [

+7 −4

Original line number	Diff line number	Diff line
		#! /usr/bin/env nix-shell
		#! nix-shell ../../update-shell.nix -i bash
		#! nix-shell ../../update-shell.nix -i bash -p wget prefetch-npm-deps

		set -eo pipefail
		cd "$(dirname "${BASH_SOURCE[0]}")"
		@@ -40,6 +40,9 @@ sed -E 's#\bsha256 = ".*?"#sha256 = "'$srcHash'"#' --in-place "$nixFile"
		cargoHash=$(nix-prefetch "{ sha256 }: (import $nixpkgs {}).vscode-extensions.vadimcn.vscode-lldb.adapter.cargoDeps.overrideAttrs (_: { outputHash = sha256; })")
		sed -E 's#\bcargoSha256 = ".*?"#cargoSha256 = "'$cargoHash'"#' --in-place "$nixFile"

		# update node dependencies
		src="$(nix-build $nixpkgs -A vscode-extensions.vadimcn.vscode-lldb.src --no-out-link)"
		nix-shell -p node2nix -I nixpkgs=$nixpkgs --run "cd build-deps && ls -R && node2nix -14 -d -i \"$src/package.json\" -l \"$src/package-lock.json\""
		pushd $TMPDIR
		wget https://raw.githubusercontent.com/$owner/$repo/v${version}/package-lock.json
		npmDepsHash=$(prefetch-npm-deps ./package-lock.json)
		popd
		sed -E 's#\bnpmDepsHash = ".*?"#npmDepsHash = "'$npmDepsHash'"#' --in-place "$nixFile"