Commit 4ecec0b6 authored by Kamil Monicz's avatar Kamil Monicz Committed by Masum Reza
Browse files

code-cursor: use generic vscode package builder

parent e7d337b4

pkgs/applications/editors/vscode/generic.nix

+5 −0
Original line number Diff line number Diff line
@@ -53,6 +53,7 @@ 
  useVSCodeRipgrep ? false,

  ripgrep,

  hasVsceSign ? false,

  patchVSCodePath ? true,

}:



stdenv.mkDerivation (
@@ -262,9 +263,13 @@ stdenv.mkDerivation ( 
            mkdir -p "$out/share/pixmaps"

            cp "$out/lib/${libraryName}/resources/app/resources/linux/code.png" "$out/share/pixmaps/${iconName}.png"



          ''

          + (lib.optionalString patchVSCodePath ''

            # Override the previously determined VSCODE_PATH with the one we know to be correct

            sed -i "/ELECTRON=/iVSCODE_PATH='$out/lib/${libraryName}'" "$out/bin/${executableName}"

            grep -q "VSCODE_PATH='$out/lib/${libraryName}'" "$out/bin/${executableName}" # check if sed succeeded

          '')

          + ''



            # Remove native encryption code, as it derives the key from the executable path which does not work for us.

            # The credentials should be stored in a secure keychain already, so the benefit of this is questionable

pkgs/by-name/co/code-cursor/package.nix

+56 −147
Original line number Diff line number Diff line 
{

  lib,

  stdenvNoCC,

  stdenv,

  callPackage,

  vscode-generic,

  fetchurl,



  # build

  appimageTools,



  # linux dependencies

  alsa-lib,

  at-spi2-atk,

  autoPatchelfHook,

  cairo,

  cups,

  curlWithGnuTls,

  egl-wayland,

  expat,

  fontconfig,

  freetype,

  ffmpeg,

  glib,

  glibc,

  glibcLocales,

  gtk3,

  libappindicator-gtk3,

  libdrm,

  libgbm,

  libGL,

  libnotify,

  libva-minimal,

  libxkbcommon,

  libxkbfile,

  makeWrapper,

  nspr,

  nss,

  pango,

  pciutils,

  pulseaudio,

  vivaldi-ffmpeg-codecs,

  vulkan-loader,

  wayland,



  # linux installation

  rsync,

  commandLineArgs ? "",



  # darwin build

  undmg,

  commandLineArgs ? "",

  useVSCodeRipgrep ? stdenv.hostPlatform.isDarwin,

}:

let

  pname = "cursor";

  version = "1.0.0";



  inherit (stdenvNoCC) hostPlatform;

let

  inherit (stdenv) hostPlatform;

  finalCommandLineArgs = "--update=false " + commandLineArgs;



  sources = {

    x86_64-linux = fetchurl {
@@ -73,115 +34,47 @@ let 
  };



  source = sources.${hostPlatform.system};



  # Linux -- build from AppImage

  appimageContents = appimageTools.extractType2 {

    inherit version pname;

    src = source;

  };



  wrappedAppimage = appimageTools.wrapType2 {

    inherit version pname;

    src = source;

  };



in

stdenvNoCC.mkDerivation {

  inherit pname version;

(callPackage vscode-generic rec {

  inherit useVSCodeRipgrep;

  commandLineArgs = finalCommandLineArgs;



  src = if hostPlatform.isLinux then wrappedAppimage else source;



  nativeBuildInputs =

    lib.optionals hostPlatform.isLinux [

      autoPatchelfHook

      glibcLocales

      makeWrapper

      rsync

    ]

    ++ lib.optionals hostPlatform.isDarwin [ undmg ];



  buildInputs = lib.optionals hostPlatform.isLinux [

    alsa-lib

    at-spi2-atk

    cairo

    cups

    curlWithGnuTls

    egl-wayland

    expat

    ffmpeg

    glib

    gtk3

    libdrm

    libgbm

    libGL

    libva-minimal

    libxkbcommon

    libxkbfile

    nspr

    nss

    pango

    pulseaudio

    vivaldi-ffmpeg-codecs

    vulkan-loader

    wayland

  ];



  runtimeDependencies = lib.optionals hostPlatform.isLinux [

    egl-wayland

    ffmpeg

    glibc

    libappindicator-gtk3

    libnotify

    libxkbfile

    pciutils

    pulseaudio

    wayland

    fontconfig

    freetype

  ];



  sourceRoot = lib.optionalString hostPlatform.isDarwin ".";



  # Don't break code signing

  dontUpdateAutotoolsGnuConfigScripts = hostPlatform.isDarwin;

  dontConfigure = hostPlatform.isDarwin;

  dontFixup = hostPlatform.isDarwin;

  version = "1.0.0";

  pname = "cursor";



  installPhase = ''

    runHook preInstall

    mkdir -p $out/

  # You can find the current VSCode version in the About dialog:

  # workbench.action.showAboutDialog (Help: About)

  vscodeVersion = "1.96.2";



    ${lib.optionalString hostPlatform.isLinux ''

      cp -r bin $out/bin

      # mkdir -p $out/share/cursor

      # cp -ar ${appimageContents}/usr/share $out/

  executableName = "cursor";

  longName = "Cursor";

  shortName = "cursor";

  libraryName = "cursor";

  iconName = "cursor";



      rsync -a -q ${appimageContents}/usr/share $out/ --exclude "*.so"

  src =

    if hostPlatform.isLinux then

      appimageTools.extract {

        inherit pname version;

        src = source;

      }

    else

      source;



      # Fix the desktop file to point to the correct location

      substituteInPlace $out/share/applications/cursor.desktop --replace-fail "/usr/share/cursor/cursor" "$out/bin/cursor"

  sourceRoot =

    if hostPlatform.isLinux then "${pname}-${version}-extracted/usr/share/cursor" else "Cursor.app";



      wrapProgram $out/bin/cursor \

        --add-flags "--update=false" \

        --add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--ozone-platform-hint=auto --enable-features=WaylandWindowDecorations --enable-wayland-ime=true}} --no-update" \

        --add-flags ${lib.escapeShellArg commandLineArgs}

    ''}

  tests = { };



    ${lib.optionalString hostPlatform.isDarwin ''

      APP_DIR="$out/Applications"

      mkdir -p "$APP_DIR"

      cp -Rp Cursor.app "$APP_DIR"

      mkdir -p "$out/bin"

      ln -s "$APP_DIR/Cursor.app/Contents/Resources/app/bin/cursor" "$out/bin/cursor"

    ''}

  updateScript = ./update.sh;



    runHook postInstall

  '';

  # Editing the `cursor` binary within the app bundle causes the bundle's signature

  # to be invalidated, which prevents launching starting with macOS Ventura, because Cursor is notarized.

  # See https://eclecticlight.co/2022/06/17/app-security-changes-coming-in-ventura/ for more information.

  dontFixup = stdenv.hostPlatform.isDarwin;



  passthru = {

    inherit sources;

    updateScript = ./update.sh;

  };

  # Cursor has no wrapper script.

  patchVSCodePath = false;



  meta = {

    description = "AI-powered code editor built on vscode";
@@ -196,4 +89,20 @@ stdenvNoCC.mkDerivation { 
    platforms = lib.platforms.linux ++ lib.platforms.darwin;

    mainProgram = "cursor";

  };

}
 
}).overrideAttrs

  (oldAttrs: {

    nativeBuildInputs =

      (oldAttrs.nativeBuildInputs or [ ])

      ++ lib.optionals hostPlatform.isDarwin [ undmg ];



    preInstall =

      (oldAttrs.preInstall or "")

      + lib.optionalString hostPlatform.isLinux ''

        mkdir -p bin

        ln -s ../cursor bin/cursor

      '';



    passthru = (oldAttrs.passthru or { }) // {

      inherit sources;

    };

  })

pkgs/top-level/all-packages.nix

+6 −0
Original line number Diff line number Diff line
@@ -14392,6 +14392,12 @@ with pkgs; 
  vscodium-fhs = vscodium.fhs;

  vscodium-fhsWithPackages = vscodium.fhsWithPackages;













  code-cursor = callPackage ../by-name/co/code-cursor/package.nix {













    vscode-generic = ../applications/editors/vscode/generic.nix;













  };













  code-cursor-fhs = code-cursor.fhs;













  code-cursor-fhsWithPackages = code-cursor.fhsWithPackages;



























  windsurf = callPackage ../by-name/wi/windsurf/package.nix {















    vscode-generic = ../applications/editors/vscode/generic.nix;















  };