From 8e1af55405073d0fc1e79b39bc2b5ea5c1476e6e Mon Sep 17 00:00:00 2001
From: emaryn <emaryn@users.noreply.github.com>
Date: Sat, 21 Jun 2025 23:34:57 +0800
Subject: [PATCH] xkbset: 0.6 -> 0.8

---
 pkgs/by-name/xk/xkbset/package.nix | 30 +++++++++++++++---------------
 1 file changed, 15 insertions(+), 15 deletions(-)

diff --git a/pkgs/by-name/xk/xkbset/package.nix b/pkgs/by-name/xk/xkbset/package.nix
index 668c801acd54..408a47af1858 100644
--- a/pkgs/by-name/xk/xkbset/package.nix
+++ b/pkgs/by-name/xk/xkbset/package.nix
@@ -1,18 +1,20 @@
 {
   lib,
   stdenv,
-  fetchurl,
+  fetchFromGitHub,
   perl,
   libX11,
 }:
 
-stdenv.mkDerivation rec {
+stdenv.mkDerivation (finalAttrs: {
   pname = "xkbset";
-  version = "0.6";
+  version = "0.8";
 
-  src = fetchurl {
-    url = "http://faculty.missouri.edu/~stephen/software/xkbset/xkbset-${version}.tar.gz";
-    sha256 = "sha256-rAMv7EnExPDyMY0/RhiXDFFBkbFC4GxRpmH+I0KlNaU=";
+  src = fetchFromGitHub {
+    owner = "stephenmontgomerysmith";
+    repo = "xkbset";
+    tag = "v${finalAttrs.version}";
+    hash = "sha256-N2kD4XeBV09tzdBlHW/Y5ZK3xdr3aiszFtR6bvfTRvU=";
   };
 
   buildInputs = [
@@ -20,9 +22,7 @@ stdenv.mkDerivation rec {
     libX11
   ];
 
-  postPatch = ''
-    sed "s:^X11PREFIX=.*:X11PREFIX=$out:" -i Makefile
-  '';
+  makeFlags = [ "X11PREFIX=${placeholder "out"}" ];
 
   preInstall = ''
     mkdir -p $out/bin
@@ -33,12 +33,12 @@ stdenv.mkDerivation rec {
     rm -f $out/bin/xkbset-gui
   '';
 
-  meta = with lib; {
-    homepage = "http://faculty.missouri.edu/~stephen/software/#xkbset";
+  meta = {
+    homepage = "https://github.com/stephenmontgomerysmith/xkbset";
     description = "Program to help manage many of XKB features of X window";
-    maintainers = with maintainers; [ drets ];
-    platforms = platforms.linux;
-    license = licenses.bsd3;
+    maintainers = with lib.maintainers; [ drets ];
+    platforms = lib.platforms.linux;
+    license = lib.licenses.bsd3;
     mainProgram = "xkbset";
   };
-}
+})