From 56bd1c58b579655bbca5e0162fb6a2f22ea16f6e Mon Sep 17 00:00:00 2001 From: Artturin Date: Sun, 8 May 2022 23:48:19 +0300 Subject: [PATCH] swaylock: enable strictDeps and pull patch to fix cross --- pkgs/applications/window-managers/sway/lock.nix | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/pkgs/applications/window-managers/sway/lock.nix b/pkgs/applications/window-managers/sway/lock.nix index b70160b1dbf..970fdfe371f 100644 --- a/pkgs/applications/window-managers/sway/lock.nix +++ b/pkgs/applications/window-managers/sway/lock.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub +{ lib, stdenv, fetchFromGitHub, fetchpatch , meson, ninja, pkg-config, scdoc, wayland-scanner , wayland, wayland-protocols, libxkbcommon, cairo, gdk-pixbuf, pam }: @@ -14,6 +14,17 @@ stdenv.mkDerivation rec { sha256 = "sha256-VVGgidmSQWKxZNx9Cd6z52apxpxVfmX3Ut/G9kzfDcY="; }; + patches = [ + # remove once when updating to 1.7 + # https://github.com/swaywm/swaylock/pull/235 + (fetchpatch { + url = "https://github.com/swaywm/swaylock/commit/5a1e6ad79aa7d79b32d36cda39400f3e889b8f8f.diff"; + sha256 = "sha256-ZcZVImUzvng7sluC6q2B5UL8sVunLe4PIfc+tyw48RQ="; + }) + ]; + + strictDeps = true; + depsBuildBuild = [ pkg-config ]; nativeBuildInputs = [ meson ninja pkg-config scdoc wayland-scanner ]; buildInputs = [ wayland wayland-protocols libxkbcommon cairo gdk-pixbuf pam ];