espanso: use finalAttrs
Avoids requiring to pass the new `espanso` itself when overriding.
This commit is contained in:
@@ -23,13 +23,12 @@
|
||||
waylandSupport ? false,
|
||||
x11Support ? stdenv.hostPlatform.isLinux,
|
||||
testers,
|
||||
espanso,
|
||||
}:
|
||||
# espanso does not support building with both X11 and Wayland support at the same time
|
||||
assert stdenv.hostPlatform.isLinux -> x11Support != waylandSupport;
|
||||
assert stdenv.hostPlatform.isDarwin -> !x11Support;
|
||||
assert stdenv.hostPlatform.isDarwin -> !waylandSupport;
|
||||
rustPlatform.buildRustPackage {
|
||||
rustPlatform.buildRustPackage (finalAttrs: {
|
||||
pname = "espanso";
|
||||
version = "2.2-unstable-2024-05-14";
|
||||
|
||||
@@ -130,7 +129,7 @@ rustPlatform.buildRustPackage {
|
||||
'';
|
||||
|
||||
passthru.tests.version = testers.testVersion {
|
||||
package = espanso;
|
||||
package = finalAttrs.finalPackage;
|
||||
# remove when updating to a release version
|
||||
version = "2.2.1";
|
||||
};
|
||||
@@ -151,4 +150,4 @@ rustPlatform.buildRustPackage {
|
||||
Espanso detects when you type a keyword and replaces it while you're typing.
|
||||
'';
|
||||
};
|
||||
}
|
||||
})
|
||||
|
||||
@@ -2129,7 +2129,6 @@ with pkgs;
|
||||
espanso-wayland = espanso.override {
|
||||
x11Support = false;
|
||||
waylandSupport = true;
|
||||
espanso = espanso-wayland;
|
||||
};
|
||||
|
||||
f3d_egl = f3d.override { vtk_9 = vtk_9_egl; };
|
||||
|
||||
Reference in New Issue
Block a user