From e6918c79f5f78d94d9d17d1d5edcf9c188af3a2c Mon Sep 17 00:00:00 2001 From: Heitor Augusto Date: Fri, 21 Mar 2025 17:19:00 -0300 Subject: [PATCH] cosmic-panel: use libcosmicAppHook --- pkgs/by-name/co/cosmic-panel/package.nix | 22 ++-------------------- 1 file changed, 2 insertions(+), 20 deletions(-) diff --git a/pkgs/by-name/co/cosmic-panel/package.nix b/pkgs/by-name/co/cosmic-panel/package.nix index 2c1cd5dcb0c3..51dde281a9d4 100644 --- a/pkgs/by-name/co/cosmic-panel/package.nix +++ b/pkgs/by-name/co/cosmic-panel/package.nix @@ -3,11 +3,8 @@ stdenv, rustPlatform, fetchFromGitHub, + libcosmicAppHook, just, - pkg-config, - libglvnd, - libxkbcommon, - wayland, }: rustPlatform.buildRustPackage (finalAttrs: { @@ -26,13 +23,7 @@ rustPlatform.buildRustPackage (finalAttrs: { nativeBuildInputs = [ just - pkg-config - ]; - - buildInputs = [ - libglvnd - libxkbcommon - wayland + libcosmicAppHook ]; dontUseJustBuild = true; @@ -47,15 +38,6 @@ rustPlatform.buildRustPackage (finalAttrs: { "target/${stdenv.hostPlatform.rust.cargoShortTarget}/release/cosmic-panel" ]; - # Force linking to libEGL, which is always dlopen()ed. - "CARGO_TARGET_${stdenv.hostPlatform.rust.cargoEnvVarTarget}_RUSTFLAGS" = - map (a: "-C link-arg=${a}") - [ - "-Wl,--push-state,--no-as-needed" - "-lEGL" - "-Wl,--pop-state" - ]; - meta = { homepage = "https://github.com/pop-os/cosmic-panel"; description = "Panel for the COSMIC Desktop Environment";