From 2e4a752669d07a94fdcfc079a4ab18a62cf729f0 Mon Sep 17 00:00:00 2001 From: Adam Chance <6444703+drakon64@users.noreply.github.com> Date: Thu, 3 Apr 2025 19:28:19 +0100 Subject: [PATCH] cosmic-comp: remove useXWayland option --- nixos/modules/services/desktop-managers/cosmic.nix | 2 +- pkgs/by-name/co/cosmic-comp/package.nix | 6 ------ 2 files changed, 1 insertion(+), 7 deletions(-) diff --git a/nixos/modules/services/desktop-managers/cosmic.nix b/nixos/modules/services/desktop-managers/cosmic.nix index 576cbe1438ec..386070fa36f1 100644 --- a/nixos/modules/services/desktop-managers/cosmic.nix +++ b/nixos/modules/services/desktop-managers/cosmic.nix @@ -45,7 +45,7 @@ in cosmic-applets cosmic-applibrary cosmic-bg - (cosmic-comp.override { useXWayland = false; }) + cosmic-comp cosmic-edit cosmic-files config.services.displayManager.cosmic-greeter.package diff --git a/pkgs/by-name/co/cosmic-comp/package.nix b/pkgs/by-name/co/cosmic-comp/package.nix index 90fb1c30c203..2f3ae72a11c6 100644 --- a/pkgs/by-name/co/cosmic-comp/package.nix +++ b/pkgs/by-name/co/cosmic-comp/package.nix @@ -12,10 +12,8 @@ seatd, udev, systemd, - xwayland, nix-update-script, - useXWayland ? true, useSystemd ? lib.meta.availableOn stdenv.hostPlatform systemd, }: @@ -59,10 +57,6 @@ rustPlatform.buildRustPackage (finalAttrs: { dontCargoInstall = true; - preFixup = lib.optionalString useXWayland '' - libcosmicAppWrapperArgs+=(--prefix PATH : ${lib.makeBinPath [ xwayland ]}) - ''; - passthru.updateScript = nix-update-script { extraArgs = [ "--version"