mirror of
https://github.com/NixOS/nixpkgs.git
synced 2026-06-05 21:03:40 +00:00
zed-editor: factorize remote-server executable name
(cherry picked from commit b9ef190acb)
This commit is contained in:
committed by
Niklas Korz
parent
421f2b6fd6
commit
3231d00405
@@ -229,6 +229,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
|
||||
|
||||
useNextest = true;
|
||||
|
||||
remoteServerExecutableName = "zed-remote-server-${channel}-${finalAttrs.version}+${channel}";
|
||||
installPhase = ''
|
||||
runHook preInstall
|
||||
|
||||
@@ -286,7 +287,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
|
||||
@@ -321,7 +322,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 {
|
||||
|
||||
Reference in New Issue
Block a user