From 045224f9139951ec68d1b4922acb754bd1348904 Mon Sep 17 00:00:00 2001 From: Heitor Augusto Date: Tue, 18 Mar 2025 18:45:47 -0300 Subject: [PATCH] cosmic-greeter: refactor --- pkgs/by-name/co/cosmic-greeter/package.nix | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/pkgs/by-name/co/cosmic-greeter/package.nix b/pkgs/by-name/co/cosmic-greeter/package.nix index b6c1d204c40e..dd2c7cbb6952 100644 --- a/pkgs/by-name/co/cosmic-greeter/package.nix +++ b/pkgs/by-name/co/cosmic-greeter/package.nix @@ -14,23 +14,21 @@ wayland, }: -rustPlatform.buildRustPackage rec { +rustPlatform.buildRustPackage (finalAttrs: { pname = "cosmic-greeter"; version = "1.0.0-alpha.2"; src = fetchFromGitHub { owner = "pop-os"; repo = "cosmic-greeter"; - rev = "epoch-${version}"; + tag = "epoch-${finalAttrs.version}"; hash = "sha256-5BSsiGgL369/PePS0FmuE42tktK2bpgJziYuUEnZ2jY="; }; useFetchCargoVendor = true; cargoHash = "sha256-5TXFE/pIeIOvy8x8c5sR3YaI8R2RTA8fzloguIpE4TM="; - cargoBuildFlags = [ - "--all" - ]; + cargoBuildFlags = [ "--all" ]; nativeBuildInputs = [ rustPlatform.bindgenHook @@ -38,6 +36,7 @@ rustPlatform.buildRustPackage rec { just pkg-config ]; + buildInputs = [ libinput libxkbcommon @@ -47,6 +46,7 @@ rustPlatform.buildRustPackage rec { ]; dontUseJustBuild = true; + dontUseJustCheck = true; justFlags = [ "--set" @@ -64,12 +64,12 @@ rustPlatform.buildRustPackage rec { substituteInPlace src/greeter.rs --replace-fail '/usr/bin/env' '${lib.getExe' coreutils "env"}' ''; - meta = with lib; { + meta = { homepage = "https://github.com/pop-os/cosmic-greeter"; description = "Greeter for the COSMIC Desktop Environment"; mainProgram = "cosmic-greeter"; - license = licenses.gpl3Only; - maintainers = with maintainers; [ nyabinary ]; - platforms = platforms.linux; + license = lib.licenses.gpl3Only; + maintainers = with lib.maintainers; [ nyabinary ]; + platforms = lib.platforms.linux; }; -} +})