From 0cb2021d318964f2203e63d2e18ec37759ad7acf Mon Sep 17 00:00:00 2001 From: Heitor Augusto Date: Wed, 5 Mar 2025 20:59:22 -0300 Subject: [PATCH] cosmic-files: use libcosmicAppHook --- pkgs/by-name/co/cosmic-files/package.nix | 32 +++--------------------- 1 file changed, 4 insertions(+), 28 deletions(-) diff --git a/pkgs/by-name/co/cosmic-files/package.nix b/pkgs/by-name/co/cosmic-files/package.nix index b9974db63274..35c866575a61 100644 --- a/pkgs/by-name/co/cosmic-files/package.nix +++ b/pkgs/by-name/co/cosmic-files/package.nix @@ -3,14 +3,9 @@ stdenv, fetchFromGitHub, rustPlatform, - makeBinaryWrapper, - cosmic-icons, just, - pkg-config, + libcosmicAppHook, glib, - libxkbcommon, - wayland, - xorg, }: rustPlatform.buildRustPackage (finalAttrs: { @@ -34,17 +29,13 @@ rustPlatform.buildRustPackage (finalAttrs: { nativeBuildInputs = [ just - pkg-config - makeBinaryWrapper + libcosmicAppHook ]; - buildInputs = [ - glib - libxkbcommon - wayland - ]; + buildInputs = [ glib ]; dontUseJustBuild = true; + dontUseJustCheck = true; justFlags = [ "--set" @@ -55,21 +46,6 @@ rustPlatform.buildRustPackage (finalAttrs: { "target/${stdenv.hostPlatform.rust.cargoShortTarget}/release/cosmic-files" ]; - # LD_LIBRARY_PATH can be removed once tiny-xlib is bumped above 0.2.2 - postInstall = '' - wrapProgram "$out/bin/cosmic-files" \ - --suffix XDG_DATA_DIRS : "${cosmic-icons}/share" \ - --prefix LD_LIBRARY_PATH : ${ - lib.makeLibraryPath [ - xorg.libX11 - xorg.libXcursor - xorg.libXrandr - xorg.libXi - wayland - ] - } - ''; - meta = { homepage = "https://github.com/pop-os/cosmic-files"; description = "File Manager for the COSMIC Desktop Environment";