diff --git a/pkgs/espanso/default.nix b/pkgs/espanso/default.nix index e36450e..46bba88 100644 --- a/pkgs/espanso/default.nix +++ b/pkgs/espanso/default.nix @@ -18,6 +18,9 @@ , wxGTK32 , makeWrapper , stdenv +#, AppKit +#, Cocoa +#, Foundation , waylandSupport ? true, }: @@ -42,7 +45,7 @@ rustPlatform.buildRustPackage rec { wxGTK32 ]; - NO_X11 = "true"; + env.NO_X11 = lib.boolToString waylandSupport; buildInputs = [ libXi @@ -55,7 +58,11 @@ rustPlatform.buildRustPackage rec { libxkbcommon xclip xdotool - wxGTK32 + ] ++ lib.optionals stdenv.isDarwin [ +# AppKit +# Cocoa +# Foundation + ] ++ lib.optionals waylandSupport [ wl-clipboard ]; @@ -68,7 +75,14 @@ rustPlatform.buildRustPackage rec { postInstall = '' wrapProgram $out/bin/espanso \ - --prefix PATH : ${lib.makeBinPath [ libnotify xclip wl-clipboard setxkbmap ]} + --prefix PATH : ${lib.makeBinPath ([ + libnotify + setxkbmap + ] ++ lib.optionals waylandSupport [ + wl-clipboard + ] ++ lib.optionals (!waylandSupport) [ + xclip + ])} ''; meta = with lib; {