From 93cc30545fbc70d25a12929e3fc7d86e5e917896 Mon Sep 17 00:00:00 2001 From: Yiyu Zhou Date: Tue, 4 Nov 2025 09:15:44 -0800 Subject: [PATCH] wlock: cleanup --- pkgs/by-name/wl/wlock/package.nix | 34 +++++++++++++++++-------------- 1 file changed, 19 insertions(+), 15 deletions(-) diff --git a/pkgs/by-name/wl/wlock/package.nix b/pkgs/by-name/wl/wlock/package.nix index b9001a86d369..a11b00955c29 100644 --- a/pkgs/by-name/wl/wlock/package.nix +++ b/pkgs/by-name/wl/wlock/package.nix @@ -2,13 +2,15 @@ lib, stdenv, fetchFromGitea, - libxcrypt, pkg-config, + wayland-scanner, wayland, wayland-protocols, libxkbcommon, - wayland-scanner, + libxcrypt, + nix-update-script, }: + stdenv.mkDerivation (finalAttrs: { pname = "wlock"; version = "1.0"; @@ -25,28 +27,30 @@ stdenv.mkDerivation (finalAttrs: { substituteInPlace Makefile --replace-fail 'chmod 4755' 'chmod 755' ''; - buildInputs = [ - libxcrypt - wayland - wayland-protocols - libxkbcommon - ]; - strictDeps = true; - makeFlags = [ - "PREFIX=$(out)" - ("WAYLAND_SCANNER=" + lib.getExe wayland-scanner) - ]; - nativeBuildInputs = [ pkg-config wayland-scanner ]; + buildInputs = [ + wayland + wayland-protocols + libxkbcommon + libxcrypt + ]; + + makeFlags = [ + "PREFIX=$(out)" + ("WAYLAND_SCANNER=" + lib.getExe wayland-scanner) + ]; + + passthru.updateScript = nix-update-script { }; + meta = { description = "Sessionlocker for Wayland compositors that support the ext-session-lock-v1 protocol"; - license = lib.licenses.gpl3; + license = lib.licenses.gpl3Only; homepage = "https://codeberg.org/sewn/wlock"; platforms = lib.platforms.linux; maintainers = with lib.maintainers; [ fliegendewurst ];