From 90af686ddb32dd565244ef53ce3a8d5e5cbae1be Mon Sep 17 00:00:00 2001
From: Weijia Wang <9713184+wegank@users.noreply.github.com>
Date: Fri, 30 Dec 2022 06:40:28 +0100
Subject: [PATCH 1/6] xorgcffiles: add aarch64-darwin support

---
 pkgs/servers/x11/xorg/overrides.nix | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/pkgs/servers/x11/xorg/overrides.nix b/pkgs/servers/x11/xorg/overrides.nix
index ddd5acad7a1a..b6ad8670ec6c 100644
--- a/pkgs/servers/x11/xorg/overrides.nix
+++ b/pkgs/servers/x11/xorg/overrides.nix
@@ -1067,6 +1067,13 @@ self: super:
   });
 
   xorgcffiles = super.xorgcffiles.overrideAttrs (attrs: {
+    patches = [
+      (fetchpatch {
+        name = "add-aarch64-darwin-support.patch";
+        url = "https://gitlab.freedesktop.org/xorg/util/cf/-/commit/8d88c559b177e832b581c8ac0aa383b6cf79e0d0.patch";
+        sha256 = "sha256-wCijdmlUtVgOh9Rp/LJrg1ObYm4OPTke5Xwu0xC0ap4=";
+      })
+    ];
     postInstall = lib.optionalString stdenv.isDarwin ''
       substituteInPlace $out/lib/X11/config/darwin.cf --replace "/usr/bin/" ""
     '';

From 34878aa66d8346b5e84c6904a0445d44bb75ea79 Mon Sep 17 00:00:00 2001
From: Weijia Wang <9713184+wegank@users.noreply.github.com>
Date: Thu, 22 Dec 2022 20:54:55 +0100
Subject: [PATCH 2/6] oneko: unbreak on aarch64-darwin

---
 pkgs/applications/misc/oneko/default.nix | 2 --
 1 file changed, 2 deletions(-)

diff --git a/pkgs/applications/misc/oneko/default.nix b/pkgs/applications/misc/oneko/default.nix
index e0af54b1e4e6..17a94511e3fc 100644
--- a/pkgs/applications/misc/oneko/default.nix
+++ b/pkgs/applications/misc/oneko/default.nix
@@ -35,7 +35,5 @@ stdenv.mkDerivation rec {
     license = with licenses; [ publicDomain ];
     maintainers = with maintainers; [ xaverdh irenes ];
     platforms = platforms.unix;
-    # never built on aarch64-darwin since first introduction in nixpkgs
-    broken = stdenv.isDarwin && stdenv.isAarch64;
   };
 }

From e70ea256f42f71f9ca7e5376024e80eb469ad6c3 Mon Sep 17 00:00:00 2001
From: Weijia Wang <9713184+wegank@users.noreply.github.com>
Date: Thu, 22 Dec 2022 20:55:01 +0100
Subject: [PATCH 3/6] xearth: unbreak on aarch64-darwin

---
 pkgs/applications/science/astronomy/xearth/default.nix | 2 --
 1 file changed, 2 deletions(-)

diff --git a/pkgs/applications/science/astronomy/xearth/default.nix b/pkgs/applications/science/astronomy/xearth/default.nix
index abcedf7ee7b9..bd92ae01ebb1 100644
--- a/pkgs/applications/science/astronomy/xearth/default.nix
+++ b/pkgs/applications/science/astronomy/xearth/default.nix
@@ -26,8 +26,6 @@ stdenv.mkDerivation rec {
     maintainers = [ maintainers.mafo ];
     license = "xearth";
     platforms=platforms.unix;
-    # never built on aarch64-darwin since first introduction in nixpkgs
-    broken = stdenv.isDarwin && stdenv.isAarch64;
   };
 
 }

From 42e4d047d12f09bb6249b0385825a7e91f6b08ec Mon Sep 17 00:00:00 2001
From: Weijia Wang <9713184+wegank@users.noreply.github.com>
Date: Thu, 22 Dec 2022 20:55:07 +0100
Subject: [PATCH 4/6] xskat: unbreak on aarch64-darwin

---
 pkgs/games/xskat/default.nix | 2 --
 1 file changed, 2 deletions(-)

diff --git a/pkgs/games/xskat/default.nix b/pkgs/games/xskat/default.nix
index f8c5f539f7d2..74c2be586ceb 100644
--- a/pkgs/games/xskat/default.nix
+++ b/pkgs/games/xskat/default.nix
@@ -26,7 +26,5 @@ stdenv.mkDerivation rec {
     license = licenses.free;
     longDescription = "Play the german card game Skat against the AI or over IRC.";
     homepage = "http://www.xskat.de/";
-    # never built on aarch64-darwin since first introduction in nixpkgs
-    broken = stdenv.isDarwin && stdenv.isAarch64;
   };
 }

From bdaff9db296aac8dc70448b921873ce2f2bf82e4 Mon Sep 17 00:00:00 2001
From: Weijia Wang <9713184+wegank@users.noreply.github.com>
Date: Thu, 22 Dec 2022 20:55:14 +0100
Subject: [PATCH 5/6] xsok: unbreak on aarch64-darwin

---
 pkgs/games/xsok/default.nix | 2 --
 1 file changed, 2 deletions(-)

diff --git a/pkgs/games/xsok/default.nix b/pkgs/games/xsok/default.nix
index 80de216e8639..bb749b57d01e 100644
--- a/pkgs/games/xsok/default.nix
+++ b/pkgs/games/xsok/default.nix
@@ -42,7 +42,5 @@ stdenv.mkDerivation rec {
     maintainers = [lib.maintainers.raskin];
     platforms = lib.platforms.unix;
     homepage = "https://tracker.debian.org/pkg/xsok";
-    # never built on aarch64-darwin since first introduction in nixpkgs
-    broken = stdenv.isDarwin && stdenv.isAarch64;
   };
 }

From 064207b723a0f0e2ccb2fb89a4326e672133905f Mon Sep 17 00:00:00 2001
From: Weijia Wang <9713184+wegank@users.noreply.github.com>
Date: Thu, 22 Dec 2022 20:55:29 +0100
Subject: [PATCH 6/6] x11_ssh_askpass: unbreak on aarch64-darwin

---
 pkgs/tools/networking/x11-ssh-askpass/default.nix | 2 --
 1 file changed, 2 deletions(-)

diff --git a/pkgs/tools/networking/x11-ssh-askpass/default.nix b/pkgs/tools/networking/x11-ssh-askpass/default.nix
index 2dc17936abc1..049154d64413 100644
--- a/pkgs/tools/networking/x11-ssh-askpass/default.nix
+++ b/pkgs/tools/networking/x11-ssh-askpass/default.nix
@@ -30,7 +30,5 @@ stdenv.mkDerivation rec {
     description = "Lightweight passphrase dialog for OpenSSH or other open variants of SSH";
     license = licenses.mit;
     platforms = platforms.unix;
-    # never built on aarch64-darwin since first introduction in nixpkgs
-    broken = stdenv.isDarwin && stdenv.isAarch64;
   };
 }