From c92473100a5f6bba0cfd4e9b6ba3796d399c95d3 Mon Sep 17 00:00:00 2001 From: Heitor Augusto Date: Fri, 21 Mar 2025 06:10:55 -0300 Subject: [PATCH] cosmic-comp: refactor --- pkgs/by-name/co/cosmic-comp/package.nix | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) diff --git a/pkgs/by-name/co/cosmic-comp/package.nix b/pkgs/by-name/co/cosmic-comp/package.nix index 1c0bf7489aef..40c1593a9abe 100644 --- a/pkgs/by-name/co/cosmic-comp/package.nix +++ b/pkgs/by-name/co/cosmic-comp/package.nix @@ -20,14 +20,14 @@ useSystemd ? lib.meta.availableOn stdenv.hostPlatform systemd, }: -rustPlatform.buildRustPackage rec { +rustPlatform.buildRustPackage (finalAttrs: { pname = "cosmic-comp"; version = "1.0.0-alpha.2"; src = fetchFromGitHub { owner = "pop-os"; repo = "cosmic-comp"; - rev = "epoch-${version}"; + tag = "epoch-${finalAttrs.version}"; hash = "sha256-IbGMp+4nRg4v5yRvp3ujGx7+nJ6wJmly6dZBXbQAnr8="; }; @@ -40,6 +40,7 @@ rustPlatform.buildRustPackage rec { makeBinaryWrapper pkg-config ]; + buildInputs = [ libglvnd libinput @@ -65,7 +66,7 @@ rustPlatform.buildRustPackage rec { ]; makeFlags = [ - "prefix=$(out)" + "prefix=${placeholder "out"}" "CARGO_TARGET_DIR=target/${stdenv.hostPlatform.rust.cargoShortTarget}" ]; @@ -90,15 +91,15 @@ rustPlatform.buildRustPackage rec { wrapProgram $out/bin/cosmic-comp "''${wrapProgramArgs[@]}" ''; - meta = with lib; { + meta = { homepage = "https://github.com/pop-os/cosmic-comp"; description = "Compositor for the COSMIC Desktop Environment"; mainProgram = "cosmic-comp"; - license = licenses.gpl3Only; - maintainers = with maintainers; [ + license = lib.licenses.gpl3Only; + maintainers = with lib.maintainers; [ qyliss nyabinary ]; - platforms = platforms.linux; + platforms = lib.platforms.linux; }; -} +})