diff --git a/src/apps/personal/overlays/hubfs.nix b/src/apps/personal/overlays/hubfs.nix
index 2241d8f..e2f07b9 100644
--- a/src/apps/personal/overlays/hubfs.nix
+++ b/src/apps/personal/overlays/hubfs.nix
@@ -1,19 +1,32 @@
 final: prev: let
+  version = "1ba013d3fe54de01c52bd74d98037fe4c0029d6e";
+
   src = final.fetchFromGitHub {
     owner = "winfsp";
     repo = "hubfs";
-    rev = "1ba013d3fe54de01c52bd74d98037fe4c0029d6e";
+    rev = version;
     hash = "sha256-R1nCdua0gacXrglQ4AZfxnO3ngVECCKKiUOgp3dWRGg=";
-  } + "/src";
+  };
 in {
-  hubfs = final.buildGoModule {
+  hubfs = final.stdenv.mkDerivation {
     name = "hubfs";
+    inherit src, version;
+    rev = version;
+
     buildInputs = with final; [
         fuse
+        fuse-common
+        go
+        cmake
     ];
-    checkPhase = ":"; # Bit of a hack here; we need to disable tests as we can't get FUSE inside the build derivation to test the package
-    inherit src;
-    vendorSha256 = "sha256-Fpa+wanlMIqxkEZ3JQdCT4ixuNBj7AquG2+wLuO5TQU=";
-    runVend = true;
+
+    buildPhase = ''
+      make
+    '';
+
+    installPhase = ''
+      mkdir -p $out/bin
+      mv hubfs $out/bin
+    '';
   };
 }
diff --git a/src/apps/personal/overlays/hubfs.nix.buildGoModule.borked b/src/apps/personal/overlays/hubfs.nix.buildGoModule.borked
new file mode 100644
index 0000000..2241d8f
--- /dev/null
+++ b/src/apps/personal/overlays/hubfs.nix.buildGoModule.borked
@@ -0,0 +1,19 @@
+final: prev: let
+  src = final.fetchFromGitHub {
+    owner = "winfsp";
+    repo = "hubfs";
+    rev = "1ba013d3fe54de01c52bd74d98037fe4c0029d6e";
+    hash = "sha256-R1nCdua0gacXrglQ4AZfxnO3ngVECCKKiUOgp3dWRGg=";
+  } + "/src";
+in {
+  hubfs = final.buildGoModule {
+    name = "hubfs";
+    buildInputs = with final; [
+        fuse
+    ];
+    checkPhase = ":"; # Bit of a hack here; we need to disable tests as we can't get FUSE inside the build derivation to test the package
+    inherit src;
+    vendorSha256 = "sha256-Fpa+wanlMIqxkEZ3JQdCT4ixuNBj7AquG2+wLuO5TQU=";
+    runVend = true;
+  };
+}