Skip to content

Commit 9789178

Browse files
committed
zed-editor: use finalAttrs.finalPackage whenever possible
Signed-off-by: John Titor <[email protected]>
1 parent 5aab355 commit 9789178

File tree

1 file changed

+10
-5
lines changed

1 file changed

+10
-5
lines changed

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

Lines changed: 10 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,6 @@
2727
gitUpdater,
2828
cargo-about,
2929
versionCheckHook,
30-
zed-editor,
3130
buildFHSEnv,
3231
cargo-bundle,
3332
git,
@@ -59,6 +58,7 @@ let
5958
# extension tooling without significant pain.
6059
fhs =
6160
{
61+
zed-editor,
6262
additionalPkgs ? pkgs: [ ],
6363
}:
6464
buildFHSEnv {
@@ -309,17 +309,22 @@ rustPlatform.buildRustPackage (finalAttrs: {
309309
rev-prefix = "v";
310310
ignoredVersions = "(*-pre|0.999999.0|0.9999-temporary)";
311311
};
312-
fhs = fhs { };
313-
fhsWithPackages = f: fhs { additionalPkgs = f; };
312+
fhs = fhs { zed-editor = finalAttrs.finalPackage; };
313+
fhsWithPackages =
314+
f:
315+
fhs {
316+
zed-editor = finalAttrs.finalPackage;
317+
additionalPkgs = f;
318+
};
314319
tests =
315320
{
316321
remoteServerVersion = testers.testVersion {
317-
package = zed-editor.remote_server;
322+
package = finalAttrs.finalPackage.remote_server;
318323
command = "zed-remote-server-stable-${finalAttrs.version} version";
319324
};
320325
}
321326
// lib.optionalAttrs stdenv.hostPlatform.isLinux {
322-
withGles = zed-editor.override { withGLES = true; };
327+
withGles = finalAttrs.finalPackage.override { withGLES = true; };
323328
};
324329
};
325330

0 commit comments

Comments
 (0)