svkbd: 0.4.1 -> 0.4.2 (#359414)

pkgs/by-name/sv/svkbd/package.nix

@@ -1,37 +1,38 @@
-{ lib
-, stdenv
-, fetchurl
-, writeText
-, pkg-config
-, libX11
-, libXft
-, libXi
-, libXinerama
-, libXtst
-, layout ? null
-, conf ? null
-, patches ? [ ]
+{
+  lib,
+  stdenv,
+  fetchurl,
+  writeText,
+  pkg-config,
+  libX11,
+  libXft,
+  libXi,
+  libXinerama,
+  libXtst,
+  layout ? "mobile-intl",
+  conf ? null,
+  patches ? [ ],
 }:
 
-stdenv.mkDerivation rec {
+stdenv.mkDerivation (finalAttrs: {
   pname = "svkbd";
-  version = "0.4.1";
+  version = "0.4.2";
 
   src = fetchurl {
-    url = "https://dl.suckless.org/tools/svkbd-${version}.tar.gz";
-    sha256 = "sha256-+8Jh/D4dgULhRXtC1tZQg6AK4POh9czyRyrMi0auD1o=";
+    url = "https://dl.suckless.org/tools/svkbd-${finalAttrs.version}.tar.gz";
+    hash = "sha256-bZQyGeMzMUdYY0ZmdKB2CFhZygDc6UDlTU4kdx+UZoA=";
   };
 
   inherit patches;
 
-  postPatch = let
-    configFile = if lib.isDerivation conf || lib.isPath conf then
-      conf
-    else
-      writeText "config.def.h" conf;
-  in lib.optionalString (conf != null) ''
-    cp ${configFile} config.def.h
-  '';
+  postPatch =
+    let
+      configFile =
+        if lib.isDerivation conf || lib.isPath conf then conf else writeText "config.def.h" conf;
+    in
+    lib.optionalString (conf != null) ''
+      cp ${configFile} config.def.h
+    '';
 
   nativeBuildInputs = [
     pkg-config
@@ -47,14 +48,15 @@ stdenv.mkDerivation rec {
 
   makeFlags = [
     "PREFIX=${placeholder "out"}"
-  ] ++ lib.optional (layout != null) "LAYOUT=${layout}";
+    "LAYOUT=${layout}"
+  ];
 
-  meta = with lib; {
+  meta = {
     description = "Simple virtual keyboard";
     homepage = "https://tools.suckless.org/x/svkbd/";
-    license = licenses.mit;
-    platforms = platforms.linux;
-    maintainers = with maintainers; [ dotlambda ];
-    mainProgram = "svkbd-mobile-intl";
+    license = lib.licenses.mit;
+    platforms = lib.platforms.linux;
+    maintainers = with lib.maintainers; [ dotlambda ];
+    mainProgram = "svkbd-${layout}";
   };
-}
+})