From 66156829d99e2f65566c47d8daf6afa183cc37f2 Mon Sep 17 00:00:00 2001
From: Colin <colin@uninsane.org>
Date: Fri, 26 May 2023 17:22:57 +0000
Subject: [PATCH] flake/nixpkgs: 2023-05-22 -> 2023-05-24
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

```
• Updated input 'nixpkgs-unpatched':
    'github:nixos/nixpkgs/7084250df3d7f9735087d3234407f3c1fc2400e3' (2023-05-22)
  → 'github:nixos/nixpkgs/f91ee3065de91a3531329a674a45ddcb3467a650' (2023-05-24)
```
---
 flake.lock          | 6 +++---
 nixpatches/list.nix | 8 --------
 overlays/cross.nix  | 4 ++++
 3 files changed, 7 insertions(+), 11 deletions(-)

diff --git a/flake.lock b/flake.lock
index 4c0e22c44..223d4bca8 100644
--- a/flake.lock
+++ b/flake.lock
@@ -82,11 +82,11 @@
     },
     "nixpkgs-unpatched": {
       "locked": {
-        "lastModified": 1684754342,
-        "narHash": "sha256-plGnjnbnPLoZCTdQX21oT7xliQhFtgcWlkuDHgtEb1o=",
+        "lastModified": 1684935479,
+        "narHash": "sha256-6QMMsXMr2nhmOPHdti2j3KRHt+bai2zw+LJfdCl97Mk=",
         "owner": "nixos",
         "repo": "nixpkgs",
-        "rev": "7084250df3d7f9735087d3234407f3c1fc2400e3",
+        "rev": "f91ee3065de91a3531329a674a45ddcb3467a650",
         "type": "github"
       },
       "original": {
diff --git a/nixpatches/list.nix b/nixpatches/list.nix
index 123149699..b58b6521b 100644
--- a/nixpatches/list.nix
+++ b/nixpatches/list.nix
@@ -129,14 +129,6 @@ in [
     hash = "sha256-+g3XhmBt/udhbBDiVyfWnfXKvZTvDurlvPblQ9HYp3s=";
   })
 
-  (fetchpatch' {
-    # 2023/05/24: merged upstream
-    # hare: unstable-2023-03-15 -> unstable-2023-04-23
-    # + harec: unstable-2023-02-18 -> unstable-2023-04-25
-    prUrl = "https://github.com/NixOS/nixpkgs/pull/233732";
-    hash = "sha256-SGDKvsMiK3Pq57JEj/MamDBX5jBXwV/E5jclKO2NAUs=";
-  })
-
   # (fetchpatch' {
   #   title = "hare-json: init at unstable-2023-01-31";
   #   saneCommit = "260f9c6ac4e3564acbceb46aa4b65fbb652f8e23";
diff --git a/overlays/cross.nix b/overlays/cross.nix
index cdd067b8c..7e7cc0bf6 100644
--- a/overlays/cross.nix
+++ b/overlays/cross.nix
@@ -1135,6 +1135,10 @@ in {
       mvToNativeInputs [ final.gettext final.glib ] prev.xdg-desktop-portal-gnome
     )
   );
+  # "fatal error: urcu.h: No such file or directory"
+  # xfsprogs wants to compile things for the build target (BUILD_CC)
+  # xfsprogs = useEmulatedStdenv prev.xfsprogs;
+  xfsprogs = addNativeInputs [ final.liburcu ] prev.xfsprogs;
   # webkitgtk = prev.webkitgtk.override { stdenv = final.ccacheStdenv; };
   # webp-pixbuf-loader = prev.webp-pixbuf-loader.override {
   #   # fixes "Builder called die: Cannot wrap '/nix/store/kpp8qhzdjqgvw73llka5gpnsj0l4jlg8-gdk-pixbuf-aarch64-unknown-linux-gnu-2.42.10/bin/gdk-pixbuf-thumbnailer' because it is not an executable file"