File tree Expand file tree Collapse file tree 2 files changed +16
-22
lines changed Expand file tree Collapse file tree 2 files changed +16
-22
lines changed Load Diff This file was deleted.
Original file line number Diff line number Diff line change 22 lib ,
33 stdenv ,
44 fetchFromGitHub ,
5+ runCommand ,
56 buildNpmPackage ,
67 clang ,
78 go ,
89 libsForQt5 ,
10+ qt6 ,
911} :
1012
13+ let
14+ # Qt 6 doesn’t provide the rcc binary so we create an ad hoc package pulling
15+ # it from Qt 5.
16+ rcc = runCommand "rcc" { } ''
17+ mkdir -p $out/bin
18+ cp ${ lib . getExe' libsForQt5 . qt5 . qtbase . dev "rcc" } $out/bin
19+ '' ;
20+ in
1121stdenv . mkDerivation rec {
1222 pname = "bitbox" ;
13- version = "4.46.3 " ;
23+ version = "4.47.2 " ;
1424
1525 src = fetchFromGitHub {
1626 owner = "BitBoxSwiss" ;
1727 repo = "bitbox-wallet-app" ;
1828 rev = "v${ version } " ;
1929 fetchSubmodules = true ;
20- hash = "sha256-2oGVQ022NGOHLo7TBdeXG3ng1nYW8fyLwSV0hJdAl9I =" ;
30+ hash = "sha256-sRE+Nnb3oqiJEjqiyG+3/sZLp23nquw5+4VpbZVFCQ8 =" ;
2131 } ;
2232
23- patches = [
24- ./genassets.patch
25- ] ;
26-
2733 postPatch = ''
2834 substituteInPlace frontends/qt/resources/linux/usr/share/applications/bitbox.desktop \
2935 --replace-fail 'Exec=BitBox %u' 'Exec=bitbox %u'
@@ -36,7 +42,7 @@ stdenv.mkDerivation rec {
3642 inherit version ;
3743 inherit src ;
3844 sourceRoot = "source/frontends/web" ;
39- npmDepsHash = "sha256-w98wwKHiZtor5ivKd+sh5K8HnAepu6cw9RyVJ+eTq3k =" ;
45+ npmDepsHash = "sha256-eazc3OIusY8cbaF8RJOrVcyWPQexcz6lZYLLCpB1mHc =" ;
4046 installPhase = "cp -r build $out" ;
4147 } ;
4248
@@ -70,12 +76,13 @@ stdenv.mkDerivation rec {
7076 runHook postInstall
7177 '' ;
7278
73- buildInputs = [ libsForQt5 . qtwebengine ] ;
79+ buildInputs = [ qt6 . qtwebengine ] ;
7480
7581 nativeBuildInputs = [
7682 clang
7783 go
78- libsForQt5 . wrapQtAppsHook
84+ qt6 . wrapQtAppsHook
85+ rcc
7986 ] ;
8087
8188 meta = {
You can’t perform that action at this time.
0 commit comments