From 37b30aa60e0c5591a32c53bf2544b8b7e3032d2f Mon Sep 17 00:00:00 2001
From: Natsu Kagami <nki@nkagami.me>
Date: Tue, 18 Apr 2023 12:22:05 +0200
Subject: [PATCH] Patch aarch64 fhs wraps to use EnvChroot

---
 packages/aarch64-linux/typora.nix | 4 ++--
 packages/aarch64-linux/zotero.nix | 6 +++---
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/packages/aarch64-linux/typora.nix b/packages/aarch64-linux/typora.nix
index 792540e..3b31db3 100644
--- a/packages/aarch64-linux/typora.nix
+++ b/packages/aarch64-linux/typora.nix
@@ -1,4 +1,4 @@
-{ pkgs, runCommand, zstd, lib, buildFHSUserEnv }:
+{ pkgs, runCommand, zstd, lib, buildFHSEnvChroot }:
 
 let
   typora-tar = builtins.fetchurl {
@@ -11,7 +11,7 @@ let
     tar xvf ${typora-tar} -C $out
   '';
 in
-buildFHSUserEnv {
+buildFHSEnvChroot {
   name = "typora";
   targetPkgs = pkgs: with pkgs; [
     glib
diff --git a/packages/aarch64-linux/zotero.nix b/packages/aarch64-linux/zotero.nix
index 243a40e..b57bf41 100644
--- a/packages/aarch64-linux/zotero.nix
+++ b/packages/aarch64-linux/zotero.nix
@@ -1,4 +1,4 @@
-{ pkgs, runCommand, zstd, lib, buildFHSUserEnv }:
+{ pkgs, runCommandLocal, zstd, lib, buildFHSEnvChroot }:
 
 let
   zotero-tar = builtins.fetchurl {
@@ -6,13 +6,13 @@ let
     sha256 = "sha256:1fqvcbffqfrnmfz7rcmbngik37wz9dh11q9shrd9cwkq6zay9b6k";
   };
 
-  zotero-src = runCommand "zotero-src" { } ''
+  zotero-src = runCommandLocal "zotero-src" { } ''
     mkdir -p $out
     export PATH=${zstd}/bin:$PATH
     tar xvf ${zotero-tar} -C $out
   '';
 in
-buildFHSUserEnv {
+buildFHSEnvChroot {
   name = "zotero";
   targetPkgs = pkgs: with pkgs; [ gtk3 dbus-glib libstartup_notification libpaper ] ++ (with pkgs.xorg; [ libX11 libXt ]);
   runScript = "env QT_SCALE_FACTOR=2 ${zotero-src}/usr/lib/zotero/zotero";