From 66716089315a0c5de0abd41fd87f1557e84ecd0c Mon Sep 17 00:00:00 2001
From: Nick Cao <nickcao@nichi.co>
Date: Sat, 27 Apr 2024 12:01:43 -0400
Subject: [PATCH 1/2] mount-zip: format with nixfmt

---
 pkgs/tools/filesystems/mount-zip/default.nix | 27 +++++++++++++++++---
 1 file changed, 23 insertions(+), 4 deletions(-)

diff --git a/pkgs/tools/filesystems/mount-zip/default.nix b/pkgs/tools/filesystems/mount-zip/default.nix
index 8bff2e4fb47e..174cdf272c8b 100644
--- a/pkgs/tools/filesystems/mount-zip/default.nix
+++ b/pkgs/tools/filesystems/mount-zip/default.nix
@@ -1,5 +1,15 @@
-{ lib, stdenv, fetchFromGitHub, fuse, boost, gcc, icu, libzip, pandoc
-, pkg-config }:
+{
+  lib,
+  stdenv,
+  fetchFromGitHub,
+  fuse,
+  boost,
+  gcc,
+  icu,
+  libzip,
+  pandoc,
+  pkg-config,
+}:
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "mount-zip";
@@ -12,8 +22,17 @@ stdenv.mkDerivation (finalAttrs: {
     hash = "sha256-S2snseC9JAjYRberL2/CyRQTcZQ8GtGQNU3WuTqSRl4=";
   };
 
-  nativeBuildInputs = [ boost gcc icu pandoc pkg-config ];
-  buildInputs = [ fuse libzip ];
+  nativeBuildInputs = [
+    boost
+    gcc
+    icu
+    pandoc
+    pkg-config
+  ];
+  buildInputs = [
+    fuse
+    libzip
+  ];
 
   makeFlags = [ "prefix=$(out)" ];
 

From 17f6bdc8c324111a07c485b48154b8f3c59353d1 Mon Sep 17 00:00:00 2001
From: Nick Cao <nickcao@nichi.co>
Date: Sat, 27 Apr 2024 12:04:19 -0400
Subject: [PATCH 2/2] mount-zip: fix cross compilation, set strictDeps

---
 pkgs/tools/filesystems/mount-zip/default.nix | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/pkgs/tools/filesystems/mount-zip/default.nix b/pkgs/tools/filesystems/mount-zip/default.nix
index 174cdf272c8b..2610a32e7e66 100644
--- a/pkgs/tools/filesystems/mount-zip/default.nix
+++ b/pkgs/tools/filesystems/mount-zip/default.nix
@@ -4,7 +4,6 @@
   fetchFromGitHub,
   fuse,
   boost,
-  gcc,
   icu,
   libzip,
   pandoc,
@@ -22,15 +21,17 @@ stdenv.mkDerivation (finalAttrs: {
     hash = "sha256-S2snseC9JAjYRberL2/CyRQTcZQ8GtGQNU3WuTqSRl4=";
   };
 
+  strictDeps = true;
+
   nativeBuildInputs = [
-    boost
-    gcc
-    icu
     pandoc
     pkg-config
   ];
+
   buildInputs = [
+    boost
     fuse
+    icu
     libzip
   ];