From a373810abec26750bbdc372b4c160dd97e799e9a Mon Sep 17 00:00:00 2001
From: Stephen Huan <stephen.huan@cgdct.moe>
Date: Mon, 8 Sep 2025 14:49:53 -0400
Subject: [PATCH 1/2] xlayoutdisplay: fix build

---
 pkgs/by-name/xl/xlayoutdisplay/package.nix | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/pkgs/by-name/xl/xlayoutdisplay/package.nix b/pkgs/by-name/xl/xlayoutdisplay/package.nix
index 03d32d6ee66a..bbc6c5e58966 100644
--- a/pkgs/by-name/xl/xlayoutdisplay/package.nix
+++ b/pkgs/by-name/xl/xlayoutdisplay/package.nix
@@ -2,6 +2,7 @@
   lib,
   stdenv,
   fetchFromGitHub,
+  fetchpatch2,
   pkg-config,
   xorg,
   boost,
@@ -19,6 +20,15 @@ stdenv.mkDerivation rec {
     hash = "sha256-A37jFhVTW/3QNEf776Oi3ViRK+ebOPRTsEQqdmNhA7E=";
   };
 
+  patches = [
+    # https://github.com/alex-courtis/xlayoutdisplay/pull/34
+    (fetchpatch2 {
+      name = "cpp-version.patch";
+      url = "https://github.com/alex-courtis/xlayoutdisplay/commit/56983b45070edde78cc816d9cff4111315e94a7a.patch";
+      hash = "sha256-zd28Nkw8Kmm20zGT6wvdBHcHfE4p+RFotUO9zJwPQMc=";
+    })
+  ];
+
   nativeBuildInputs = [ pkg-config ];
   buildInputs = with xorg; [
     libX11

From 551635f8856156128144adf17ba93bbc9e780e50 Mon Sep 17 00:00:00 2001
From: Stephen Huan <stephen.huan@cgdct.moe>
Date: Mon, 8 Sep 2025 14:50:09 -0400
Subject: [PATCH 2/2] xlayoutdisplay: nits

---
 pkgs/by-name/xl/xlayoutdisplay/package.nix | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/pkgs/by-name/xl/xlayoutdisplay/package.nix b/pkgs/by-name/xl/xlayoutdisplay/package.nix
index bbc6c5e58966..f05f6834833f 100644
--- a/pkgs/by-name/xl/xlayoutdisplay/package.nix
+++ b/pkgs/by-name/xl/xlayoutdisplay/package.nix
@@ -9,14 +9,14 @@
   gtest,
 }:
 
-stdenv.mkDerivation rec {
+stdenv.mkDerivation (finalAttrs: {
   pname = "xlayoutdisplay";
   version = "1.5.0";
 
   src = fetchFromGitHub {
     owner = "alex-courtis";
     repo = "xlayoutdisplay";
-    rev = "v${version}";
+    rev = "v${finalAttrs.version}";
     hash = "sha256-A37jFhVTW/3QNEf776Oi3ViRK+ebOPRTsEQqdmNhA7E=";
   };
 
@@ -44,12 +44,12 @@ stdenv.mkDerivation rec {
   makeFlags = [ "PREFIX=${placeholder "out"}" ];
   enableParallelBuilding = true;
 
-  meta = with lib; {
+  meta = {
     description = "Detects and arranges linux display outputs, using XRandR for detection and xrandr for arrangement";
     homepage = "https://github.com/alex-courtis/xlayoutdisplay";
-    maintainers = with maintainers; [ dtzWill ];
-    license = licenses.asl20;
-    platforms = platforms.linux;
+    maintainers = with lib.maintainers; [ dtzWill ];
+    license = lib.licenses.asl20;
+    platforms = lib.platforms.linux;
     mainProgram = "xlayoutdisplay";
   };
-}
+})