From bb6efb84a3dca70cae4596d7d73d4f37a23ec996 Mon Sep 17 00:00:00 2001
From: Cleeyv <71959829+cleeyv@users.noreply.github.com>
Date: Mon, 2 Dec 2024 06:10:37 -0500
Subject: [PATCH] bitmask-vpn: fix calyx build (#348299)

---
 pkgs/tools/networking/bitmask-vpn/default.nix | 9 ++++++++-
 pkgs/top-level/all-packages.nix               | 2 +-
 2 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/networking/bitmask-vpn/default.nix b/pkgs/tools/networking/bitmask-vpn/default.nix
index 8a21a3b2f3eb..d4e63f51a062 100644
--- a/pkgs/tools/networking/bitmask-vpn/default.nix
+++ b/pkgs/tools/networking/bitmask-vpn/default.nix
@@ -1,9 +1,11 @@
 { lib
 , stdenv
 , substituteAll
+, git
 , fetchFromGitLab
 , buildGoModule
 , wrapQtAppsHook
+, python3
 , python3Packages
 , pkg-config
 , openvpn
@@ -30,7 +32,8 @@ let
     owner = "leap";
     repo = "bitmask-vpn";
     rev = "8b3ac473f64b6de0262fbf945ff25af8029134f1";
-    sha256 = "sha256-nYMfO091w6H7LyY1+aYubFppg4/3GiZZm4e+0m9Gb3k=";
+    leaveDotGit = true;
+    sha256 = "sha256-XUgCVHnTLZXFU+r0s1yuYryWNBJRgQrFlf3g1iRrLWs=";
   };
 
   # bitmask-root is only used on GNU/Linux
@@ -105,7 +108,9 @@ buildGoModule rec {
 
   nativeBuildInputs = [
     cmake
+    git
     pkg-config
+    python3
     python3Packages.wrapPython
     which
     wrapQtAppsHook
@@ -131,6 +136,8 @@ buildGoModule rec {
   buildPhase = ''
     runHook preBuild
 
+    make vendor
+
     # TODO: this is a hack that copies the qrc file that should by built by qmlcachegen
     # qmlcachegen is in qtdeclarative/libexec, but qmake is in qtbase/bin
     # but qmake searches for qmlcachegen in qtbase/libexec which leads to the error
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index c69187f23c3e..bb347d601be5 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -3006,7 +3006,7 @@ with pkgs;
 
   bluetooth_battery = python3Packages.callPackage ../applications/misc/bluetooth_battery { };
 
-  calyx-vpn = libsForQt5.callPackage ../tools/networking/bitmask-vpn {
+  calyx-vpn = qt6Packages.callPackage ../tools/networking/bitmask-vpn {
     provider = "calyx";
     inherit (darwin.apple_sdk.frameworks) CoreFoundation Security;
   };