From be7d4ecda3cfdedbdd2ac3aa02577f87ba583c51 Mon Sep 17 00:00:00 2001
From: Emily <vcs@emily.moe>
Date: Wed, 13 Nov 2024 16:18:49 +0000
Subject: [PATCH] watchman: reorder inputs to match upstream file

(cherry picked from commit fe60436739a0cd8aec4c7382249c2f5029dde64b)
(cherry picked from commit 0cd61fe0c8dd4ae43743a25a4eb6ee2e613f822f)
---
 pkgs/by-name/wa/watchman/package.nix | 60 +++++++++++++++-------------
 1 file changed, 32 insertions(+), 28 deletions(-)

diff --git a/pkgs/by-name/wa/watchman/package.nix b/pkgs/by-name/wa/watchman/package.nix
index 3cd870b52473..57ec17947096 100644
--- a/pkgs/by-name/wa/watchman/package.nix
+++ b/pkgs/by-name/wa/watchman/package.nix
@@ -1,34 +1,38 @@
 {
-  cargo,
-  cmake,
-  cpptoml,
-  double-conversion,
-  edencommon,
-  ensureNewerSourcesForZipFilesHook,
-  fb303,
-  fbthrift,
+  lib,
+  stdenv,
+
   fetchFromGitHub,
   fetchpatch,
-  fizz,
-  folly,
-  glog,
-  gtest,
-  lib,
-  libevent,
-  libsodium,
-  libunwind,
-  lz4,
-  openssl,
-  pcre2,
+
+  cmake,
   pkg-config,
-  rustPlatform,
   rustc,
-  stateDir ? "/tmp",
-  stdenv,
+  cargo,
+  rustPlatform,
+  ensureNewerSourcesForZipFilesHook,
+
+  pcre2,
+  openssl,
+  glog,
+  libevent,
+  edencommon,
+  folly,
+  fizz,
   wangle,
+  fbthrift,
+  fb303,
+  cpptoml,
+  gtest,
+  libunwind,
+  libsodium,
+  double-conversion,
+  lz4,
   zstd,
   apple-sdk_11,
   darwinMinVersionHook,
+
+  stateDir ? "/tmp",
 }:
 
 stdenv.mkDerivation (finalAttrs: {
@@ -53,27 +57,27 @@ stdenv.mkDerivation (finalAttrs: {
   nativeBuildInputs = [
     cmake
     pkg-config
-    ensureNewerSourcesForZipFilesHook
-    rustPlatform.cargoSetupHook
-    cargo
     rustc
+    cargo
+    rustPlatform.cargoSetupHook
+    ensureNewerSourcesForZipFilesHook
   ];
 
   buildInputs =
     [
       pcre2
       openssl
-      gtest
       glog
       libevent
-      libsodium
+      edencommon
       folly
       fizz
       wangle
       fbthrift
       fb303
       cpptoml
-      edencommon
+      gtest
+      libsodium
       libunwind
       double-conversion
       lz4