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

zed-editor: factorize remote-server executable name (#489013)

parents b2f07a75 b9ef190a

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

+3 −2
Original line number Diff line number Diff line
@@ -228,6 +228,7 @@ rustPlatform.buildRustPackage (finalAttrs: { 


  useNextest = true;



  remoteServerExecutableName = "zed-remote-server-${channel}-${finalAttrs.version}+${channel}";

  installPhase = ''

    runHook preInstall
@@ -285,7 +286,7 @@ rustPlatform.buildRustPackage (finalAttrs: { 
    )

  ''

  + lib.optionalString buildRemoteServer ''

    install -Dm755 $release_target/remote_server $remote_server/bin/zed-remote-server-${channel}-$version+${channel}

    install -Dm755 $release_target/remote_server $remote_server/bin/${finalAttrs.remoteServerExecutableName}

  ''

  + ''

    runHook postInstall
@@ -319,7 +320,7 @@ rustPlatform.buildRustPackage (finalAttrs: { 
    tests = {

      remoteServerVersion = testers.testVersion {

        package = finalAttrs.finalPackage.remote_server;

        command = "zed-remote-server-${channel}-${finalAttrs.version}+${channel} version";

        command = "${finalAttrs.remoteServerExecutableName} version";

      };

    }

    // lib.optionalAttrs stdenv.hostPlatform.isLinux {