From e49188f00caf1b6a6cf05f3d9a096a1cb9268e18 Mon Sep 17 00:00:00 2001
From: emaryn <emaryn@users.noreply.github.com>
Date: Fri, 6 Jun 2025 06:18:13 +0800
Subject: [PATCH] xscope: 1.4.1 -> 1.4.5

---
 pkgs/by-name/xs/xscope/package.nix | 41 ++++++++++++++++++++----------
 1 file changed, 27 insertions(+), 14 deletions(-)

diff --git a/pkgs/by-name/xs/xscope/package.nix b/pkgs/by-name/xs/xscope/package.nix
index 792a5412cd39..335033419cd7 100644
--- a/pkgs/by-name/xs/xscope/package.nix
+++ b/pkgs/by-name/xs/xscope/package.nix
@@ -1,29 +1,42 @@
 {
   lib,
   stdenv,
-  fetchurl,
+  fetchFromGitLab,
   pkg-config,
-  libXt,
+  autoreconfHook,
+  xorg-autoconf,
+  xorg,
 }:
 
-stdenv.mkDerivation rec {
+stdenv.mkDerivation (finalAttrs: {
   pname = "xscope";
-  version = "1.4.1";
+  version = "1.4.5";
 
-  src = fetchurl {
-    url = "mirror://xorg/individual/app/${pname}-${version}.tar.bz2";
-    sha256 = "08zl3zghvbcqy0r5dn54dim84lp52s0ygrr87jr3a942a6ypz01k";
+  src = fetchFromGitLab {
+    domain = "gitlab.freedesktop.org";
+    owner = "xorg";
+    repo = "app/xscope";
+    tag = "xscope-${finalAttrs.version}";
+    hash = "sha256-9ZmmV41PKv+WFL9I4D9NTfNVTsazCijZMMmDFSvXMlg=";
   };
 
-  nativeBuildInputs = [ pkg-config ];
-  buildInputs = [ libXt ];
+  nativeBuildInputs = [
+    autoreconfHook
+    pkg-config
+    xorg-autoconf
+  ];
 
-  meta = with lib; {
+  buildInputs = [
+    xorg.libXt
+    xorg.xtrans
+  ];
+
+  meta = {
     description = "program to monitor X11/Client conversations";
     homepage = "https://cgit.freedesktop.org/xorg/app/xscope/";
-    license = with licenses; [ mit ];
-    maintainers = with maintainers; [ crertel ];
-    platforms = with platforms; unix;
+    license = with lib.licenses; [ mit ];
+    maintainers = with lib.maintainers; [ crertel ];
+    platforms = lib.platforms.unix;
     mainProgram = "xscope";
   };
-}
+})