i3lock: migrate to by-name

pkgs/by-name/i3/i3lock/package.nix

@@ -12,12 +12,16 @@
   pam,
   libx11,
   libev,
-  cairo,
   libxkbcommon,
   libxkbfile,
   libxcb-util,
+  cairo,
 }:
-
+let
+  cairo' = cairo.override {
+    xcbSupport = true;
+  };
+in
 stdenv.mkDerivation rec {
   pname = "i3lock";
   version = "2.15";
@@ -43,7 +47,7 @@ stdenv.mkDerivation rec {
     pam
     libx11
     libev
-    cairo
+    cairo'
     libxkbcommon
     libxkbfile
     libxcb-util

pkgs/top-level/all-packages.nix

@@ -9535,10 +9535,6 @@ with pkgs;
 
   i3ipc-glib = callPackage ../applications/window-managers/i3/i3ipc-glib.nix { };
 
-  i3lock = callPackage ../applications/window-managers/i3/lock.nix {
-    cairo = cairo.override { xcbSupport = true; };
-  };
-
   i3lock-blur = callPackage ../applications/window-managers/i3/lock-blur.nix { };
 
   i3lock-color = callPackage ../applications/window-managers/i3/lock-color.nix { };