Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

zed-editor: rename zed binary to zeditor, change pname to zed-editor #344193

Merged
merged 2 commits into from
Sep 24, 2024
Merged

zed-editor: rename zed binary to zeditor, change pname to zed-editor #344193

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
b2b5981
zed-editor: change pname to zed-editor
JohnRTitor Sep 24, 2024
a28f1df
zed-editor: rename zed binary to zeditor
JohnRTitor Sep 24, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 5 additions & 5 deletions pkgs/by-name/ze/zed-editor/package.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@
assert withGLES -> stdenv.isLinux;

let
executableName = "zed";
executableName = "zeditor";
# Based on vscode.fhs
# Zed allows for users to download and use extensions
# which often include the usage of pre-built binaries.
Expand Down Expand Up @@ -84,7 +84,7 @@ let
};
in
rustPlatform.buildRustPackage rec {
pname = "zed";
pname = "zed-editor";
version = "0.153.6";

src = fetchFromGitHub {
Expand Down Expand Up @@ -218,7 +218,7 @@ rustPlatform.buildRustPackage rec {

mkdir -p $out/bin $out/libexec
cp target/${stdenv.hostPlatform.rust.cargoShortTarget}/release/zed $out/libexec/zed-editor
cp target/${stdenv.hostPlatform.rust.cargoShortTarget}/release/cli $out/bin/zed
cp target/${stdenv.hostPlatform.rust.cargoShortTarget}/release/cli $out/bin/zeditor

install -D ${src}/crates/zed/resources/[email protected] $out/share/icons/hicolor/1024x1024@2x/apps/zed.png
install -D ${src}/crates/zed/resources/app-icon.png $out/share/icons/hicolor/512x512/apps/zed.png
Expand All @@ -227,7 +227,7 @@ rustPlatform.buildRustPackage rec {
# and https://github.com/zed-industries/zed/blob/v0.141.2/script/install.sh (final desktop file name)
(
export DO_STARTUP_NOTIFY="true"
export APP_CLI="zed"
export APP_CLI="zeditor"
export APP_ICON="zed"
export APP_NAME="Zed"
export APP_ARGS="%U"
Expand Down Expand Up @@ -262,7 +262,7 @@ rustPlatform.buildRustPackage rec {
GaetanLepage
niklaskorz
];
mainProgram = "zed";
mainProgram = "zeditor";
platforms = lib.platforms.all;
# Currently broken on darwin: https://github.com/NixOS/nixpkgs/pull/303233#issuecomment-2048650618
broken = stdenv.isDarwin;
Expand Down