From 9e6936a3cee5bf551f8b9c22c3a2f0fed1f51c4b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= <mail@dotlambda.de>
Date: Tue, 26 Nov 2024 12:50:20 -0800
Subject: [PATCH 1/2] svkbd: 0.4.1 -> 0.4.2

---
 pkgs/by-name/sv/svkbd/package.nix | 17 +++++++++--------
 1 file changed, 9 insertions(+), 8 deletions(-)

diff --git a/pkgs/by-name/sv/svkbd/package.nix b/pkgs/by-name/sv/svkbd/package.nix
index cc1951e4caea..7aaec3f79691 100644
--- a/pkgs/by-name/sv/svkbd/package.nix
+++ b/pkgs/by-name/sv/svkbd/package.nix
@@ -8,18 +8,18 @@
 , libXi
 , libXinerama
 , libXtst
-, layout ? null
+, 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;
@@ -47,7 +47,8 @@ stdenv.mkDerivation rec {
 
   makeFlags = [
     "PREFIX=${placeholder "out"}"
-  ] ++ lib.optional (layout != null) "LAYOUT=${layout}";
+    "LAYOUT=${layout}"
+  ];
 
   meta = with lib; {
     description = "Simple virtual keyboard";
@@ -55,6 +56,6 @@ stdenv.mkDerivation rec {
     license = licenses.mit;
     platforms = platforms.linux;
     maintainers = with maintainers; [ dotlambda ];
-    mainProgram = "svkbd-mobile-intl";
+    mainProgram = "svkbd-${layout}";
   };
-}
+})

From 1ad988e405d06efb3080ddc368bc2ec650465456 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= <mail@dotlambda.de>
Date: Tue, 26 Nov 2024 12:58:13 -0800
Subject: [PATCH 2/2] svkbd: format with nixfmt-rfc-style

---
 pkgs/by-name/sv/svkbd/package.nix | 51 ++++++++++++++++---------------
 1 file changed, 26 insertions(+), 25 deletions(-)

diff --git a/pkgs/by-name/sv/svkbd/package.nix b/pkgs/by-name/sv/svkbd/package.nix
index 7aaec3f79691..f8385efacd74 100644
--- a/pkgs/by-name/sv/svkbd/package.nix
+++ b/pkgs/by-name/sv/svkbd/package.nix
@@ -1,16 +1,17 @@
-{ lib
-, stdenv
-, fetchurl
-, writeText
-, pkg-config
-, libX11
-, libXft
-, libXi
-, libXinerama
-, libXtst
-, layout ? "mobile-intl"
-, conf ? null
-, patches ? [ ]
+{
+  lib,
+  stdenv,
+  fetchurl,
+  writeText,
+  pkg-config,
+  libX11,
+  libXft,
+  libXi,
+  libXinerama,
+  libXtst,
+  layout ? "mobile-intl",
+  conf ? null,
+  patches ? [ ],
 }:
 
 stdenv.mkDerivation (finalAttrs: {
@@ -24,14 +25,14 @@ stdenv.mkDerivation (finalAttrs: {
 
   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
@@ -50,12 +51,12 @@ stdenv.mkDerivation (finalAttrs: {
     "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 ];
+    license = lib.licenses.mit;
+    platforms = lib.platforms.linux;
+    maintainers = with lib.maintainers; [ dotlambda ];
     mainProgram = "svkbd-${layout}";
   };
 })