Unverified Commit d77a2129 authored by Gaétan Lepage's avatar Gaétan Lepage Committed by GitHub
Browse files

zed-editor: make node-based built-in LSPs work on NixOS (#354063)

parents 4e73fc3d 7cb44f20

pkgs/by-name/ze/zed-editor/package.nix

+19 −11
Original line number Diff line number Diff line
@@ -34,6 +34,8 @@ 
  git,

  apple-sdk_15,

  darwinMinVersionHook,

  makeWrapper,

  nodePackages_latest,



  withGLES ? false,

}:
@@ -138,7 +140,8 @@ rustPlatform.buildRustPackage rec { 
    };

  };



  nativeBuildInputs = [

  nativeBuildInputs =

    [

      clang

      cmake

      copyDesktopItems
@@ -148,7 +151,9 @@ rustPlatform.buildRustPackage rec { 
      protobuf

      rustPlatform.bindgenHook

      cargo-about

  ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ cargo-bundle ];

    ]

    ++ lib.optionals stdenv.hostPlatform.isLinux [ makeWrapper ]

    ++ lib.optionals stdenv.hostPlatform.isDarwin [ cargo-bundle ];



  dontUseCmakeConfigure = true;
@@ -215,6 +220,9 @@ rustPlatform.buildRustPackage rec { 
  postFixup = lib.optionalString stdenv.hostPlatform.isLinux ''

    patchelf --add-rpath ${gpu-lib}/lib $out/libexec/*

    patchelf --add-rpath ${wayland}/lib $out/libexec/*

    wrapProgram $out/libexec/zed-editor --suffix PATH : ${

      lib.makeBinPath [ nodePackages_latest.nodejs ]

    }

  '';



  preCheck = ''