bitbox: 4.46.3 -> 4.47.2

pkgs/by-name/bi/bitbox/genassets.patch

@@ -1,13 +0,0 @@
-diff --git a/frontends/qt/genassets.sh b/frontends/qt/genassets.sh
-index 4b1ba87be..b5a9ad279 100755
---- a/frontends/qt/genassets.sh
-+++ b/frontends/qt/genassets.sh
-@@ -20,7 +20,7 @@ if [ ! -d ../web/build ]; then
- fi
- 
- echo '<!DOCTYPE RCC><RCC version="1.0"><qresource>' > assets.qrc
--/usr/bin/find ../web/build/ -maxdepth 3 -type f | sed -e "s|../web/build/||" | awk '{ print "<file alias=\"" $1 "\">../web/build/" $1 "</file>" '} >> assets.qrc
-+find ../web/build/ -maxdepth 3 -type f | sort | sed -e "s|../web/build/||" | awk '{ print "<file alias=\"" $1 "\">../web/build/" $1 "</file>" '} >> assets.qrc
- 
- echo '<file alias="trayicon.png">resources/trayicon.png</file>' >> assets.qrc
- echo '</qresource></RCC>' >> assets.qrc

pkgs/by-name/bi/bitbox/package.nix

@@ -2,28 +2,32 @@
   lib,
   stdenv,
   fetchFromGitHub,
+  runCommand,
   buildNpmPackage,
   clang,
   go,
   libsForQt5,
+  qt6,
 }:
 
+let
+  rcc = runCommand "rcc" { } ''
+    mkdir -p $out/bin
+    cp ${lib.getExe' libsForQt5.qt5.qtbase.dev "rcc"} $out/bin
+  '';
+in
 stdenv.mkDerivation rec {
   pname = "bitbox";
-  version = "4.46.3";
+  version = "4.47.2";
 
   src = fetchFromGitHub {
     owner = "BitBoxSwiss";
     repo = "bitbox-wallet-app";
     rev = "v${version}";
     fetchSubmodules = true;
-    hash = "sha256-2oGVQ022NGOHLo7TBdeXG3ng1nYW8fyLwSV0hJdAl9I=";
+    hash = "sha256-sRE+Nnb3oqiJEjqiyG+3/sZLp23nquw5+4VpbZVFCQ8=";
   };
 
-  patches = [
-    ./genassets.patch
-  ];
-
   postPatch = ''
     substituteInPlace frontends/qt/resources/linux/usr/share/applications/bitbox.desktop \
         --replace-fail 'Exec=BitBox %u' 'Exec=bitbox %u'
@@ -36,7 +40,7 @@ stdenv.mkDerivation rec {
     inherit version;
     inherit src;
     sourceRoot = "source/frontends/web";
-    npmDepsHash = "sha256-w98wwKHiZtor5ivKd+sh5K8HnAepu6cw9RyVJ+eTq3k=";
+    npmDepsHash = "sha256-eazc3OIusY8cbaF8RJOrVcyWPQexcz6lZYLLCpB1mHc=";
     installPhase = "cp -r build $out";
   };
 
@@ -70,12 +74,13 @@ stdenv.mkDerivation rec {
     runHook postInstall
   '';
 
-  buildInputs = [ libsForQt5.qtwebengine ];
+  buildInputs = [ qt6.qtwebengine ];
 
   nativeBuildInputs = [
     clang
     go
-    libsForQt5.wrapQtAppsHook
+    qt6.wrapQtAppsHook
+    rcc
   ];
 
   meta = {