Unverified Commit 6116759d authored by Sandro Jäckel's avatar Sandro Jäckel Committed by GitHub
Browse files

Merge pull request #233133 from natsukium/vscode-extensions.vadimcn.vscode-lldb/update

parents 0d457c3f cf6ff11e

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;

}

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

deleted100644 → 0
+0 −598

File deleted.

Preview size limit exceeded, changes collapsed.

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

deleted100644 → 0
+0 −3201

File deleted.

Preview size limit exceeded, changes collapsed.

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

+44 −14
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, darwin

}:

assert lib.versionAtLeast python3.version "3.5";

let

  publisher = "vadimcn";

  pname = "vscode-lldb";

  version = "1.8.1";

  version = "1.9.1";



  vscodeExtUniqueId = "${publisher}.${pname}";

  vscodeExtPublisher = publisher;
@@ -15,7 +15,7 @@ let 
    owner = "vadimcn";

    repo = "vscode-lldb";

    rev = "v${version}";

    sha256 = "sha256-5wrw8LNH14WAyIKIRGFbvrISb5RUXeD5Uh/weja9p4Q=";

    sha256 = "sha256-DqxdZtSW8TZaOFGXOZQ7a4tmgRj6iAWDppCNomdfVxY=";

  };



  # need to build a custom version of lldb and llvm for enhanced rust support
@@ -25,7 +25,7 @@ let 
    pname = "${pname}-adapter";

    inherit version src;



    cargoSha256 = "sha256-Lpo2jaDMaZGwSrpQBvBCscVbWi2Db1Cx1Tv84v1H4Es=";

    cargoSha256 = "sha256-+hfNkr9cZbOcWdWKUWUqDj9a0PKjKeApFXYZzS1XokE=";



    nativeBuildInputs = [ makeWrapper ];
@@ -42,15 +42,35 @@ 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-Cdlq1jxHSCfPjXhasClc6XzEUp3vlLgkStbhYtCyc7E=";



    nativeBuildInputs = [

      python3

      pkg-config

    ];



    buildInputs = [

      libsecret

    ] ++ lib.optionals stdenv.isDarwin (with darwin.apple_sdk.frameworks; [

      Security

      AppKit

    ]);



    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}";
@@ -62,8 +82,14 @@ in stdenv.mkDerivation { 


  patches = [ ./cmake-build-extension-only.patch ];



  postPatch = ''

    # temporary patch for forgotten version updates

    substituteInPlace CMakeLists.txt \

      --replace "1.9.0" ${version}

  '';



  postConfigure = ''

    cp -r ${nodeDeps}/lib/{node_modules,package-lock.json} .

    cp -r ${nodeDeps}/lib/node_modules .

  '';



  cmakeFlags = [
@@ -72,6 +98,10 @@ in stdenv.mkDerivation { 
  ];

  makeFlags = [ "vsix_bootstrap" ];



  preBuild = lib.optionalString stdenv.isDarwin ''

    export HOME=$TMPDIR

  '';



  installPhase = ''

    ext=$out/$installPrefix

    runHook preInstall

pkgs/applications/editors/vscode/extensions/vadimcn.vscode-lldb/update.sh

+7 −4

File changed.

Preview size limit exceeded, changes collapsed.