Merge master into staging-next

1 files changed, 15 insertions, 16 deletions

diff --git a/pkgs/applications/misc/waylock/default.nix b/pkgs/applications/misc/waylock/default.nix
index 2a29eab29730d..9ae1b348e3d47 100644
--- a/pkgs/applications/misc/waylock/default.nix
+++ b/pkgs/applications/misc/waylock/default.nix
@@ -1,28 +1,27 @@
-{
-  lib,
-  stdenv,
-  fetchFromGitHub,
-  zig,
-  wayland,
-  pkg-config,
-  scdoc,
-  wayland-protocols,
-  libxkbcommon,
-  pam,
+{ lib
+, stdenv
+, fetchFromGitHub
+, zig
+, wayland
+, pkg-config
+, scdoc
+, wayland-protocols
+, libxkbcommon
+, pam
 }:
 stdenv.mkDerivation rec {
   pname = "waylock";
-  version = "0.4.2";
+  version = "0.6.0";
 
   src = fetchFromGitHub {
     owner = "ifreund";
     repo = pname;
     rev = "v${version}";
-    sha256 = "sha256-yWjWcnGa4a+Dpc82H65yr8H7v88g/tDq0FSguubhbEI=";
+    hash = "sha256-AujBvDy10e5HhezCQcXpBUVlktRKNseLxRKdI+gtH6w=";
     fetchSubmodules = true;
   };
 
-  nativeBuildInputs = [zig wayland scdoc pkg-config];
+  nativeBuildInputs = [ zig wayland scdoc pkg-config ];
 
   buildInputs = [
     wayland-protocols
@@ -38,7 +37,7 @@ stdenv.mkDerivation rec {
 
   installPhase = ''
     runHook preInstall
-    zig build -Drelease-safe -Dman-pages --prefix $out install
+    zig build -Drelease-safe -Dman-pages -Dcpu=baseline --prefix $out install
     runHook postInstall
   '';
 
@@ -47,6 +46,6 @@ stdenv.mkDerivation rec {
     description = "A small screenlocker for Wayland compositors";
     license = licenses.isc;
     platforms = platforms.linux;
-    maintainers = with maintainers; [jordanisaacs];
+    maintainers = with maintainers; [ jordanisaacs ];
   };
 }