Merge pull request #57921 from rnhmjoj/monero
monero-gui: fix missing qml imports
This commit is contained in:
commit
a921f8a1d1
@ -2,8 +2,8 @@
|
|||||||
, makeWrapper, makeDesktopItem
|
, makeWrapper, makeDesktopItem
|
||||||
, qtbase, qmake, qtmultimedia, qttools
|
, qtbase, qmake, qtmultimedia, qttools
|
||||||
, qtgraphicaleffects, qtdeclarative
|
, qtgraphicaleffects, qtdeclarative
|
||||||
, qtlocation, qtquickcontrols2, qtwebchannel
|
, qtlocation, qtquickcontrols, qtquickcontrols2
|
||||||
, qtwebengine, qtx11extras, qtxmlpatterns
|
, qtwebchannel, qtwebengine, qtx11extras, qtxmlpatterns
|
||||||
, monero, unbound, readline, boost, libunwind
|
, monero, unbound, readline, boost, libunwind
|
||||||
, libsodium, pcsclite, zeromq, cppzmq, pkgconfig
|
, libsodium, pcsclite, zeromq, cppzmq, pkgconfig
|
||||||
, hidapi
|
, hidapi
|
||||||
@ -11,6 +11,18 @@
|
|||||||
|
|
||||||
with stdenv.lib;
|
with stdenv.lib;
|
||||||
|
|
||||||
|
let
|
||||||
|
qmlPath = qmlLib: "${qmlLib}/${qtbase.qtQmlPrefix}";
|
||||||
|
|
||||||
|
qml2ImportPath = concatMapStringsSep ":" qmlPath [
|
||||||
|
qtbase.bin qtmultimedia.bin qtgraphicaleffects
|
||||||
|
qtdeclarative.bin qtlocation.bin
|
||||||
|
qtquickcontrols qtquickcontrols2.bin
|
||||||
|
qtwebchannel.bin qtwebengine.bin qtxmlpatterns
|
||||||
|
];
|
||||||
|
|
||||||
|
in
|
||||||
|
|
||||||
stdenv.mkDerivation rec {
|
stdenv.mkDerivation rec {
|
||||||
name = "monero-gui-${version}";
|
name = "monero-gui-${version}";
|
||||||
version = "0.14.0.0";
|
version = "0.14.0.0";
|
||||||
@ -26,7 +38,8 @@ stdenv.mkDerivation rec {
|
|||||||
|
|
||||||
buildInputs = [
|
buildInputs = [
|
||||||
qtbase qtmultimedia qtgraphicaleffects
|
qtbase qtmultimedia qtgraphicaleffects
|
||||||
qtdeclarative qtlocation qtquickcontrols2
|
qtdeclarative qtlocation
|
||||||
|
qtquickcontrols qtquickcontrols2
|
||||||
qtwebchannel qtwebengine qtx11extras
|
qtwebchannel qtwebengine qtx11extras
|
||||||
qtxmlpatterns monero unbound readline
|
qtxmlpatterns monero unbound readline
|
||||||
boost libunwind libsodium pcsclite zeromq
|
boost libunwind libsodium pcsclite zeromq
|
||||||
@ -81,6 +94,11 @@ stdenv.mkDerivation rec {
|
|||||||
cp $src/images/appicons/$size.png \
|
cp $src/images/appicons/$size.png \
|
||||||
$out/share/icons/hicolor/$size/apps/monero.png
|
$out/share/icons/hicolor/$size/apps/monero.png
|
||||||
done;
|
done;
|
||||||
|
|
||||||
|
# wrap runtime dependencies
|
||||||
|
wrapProgram $out/bin/monero-wallet-gui \
|
||||||
|
--set QML2_IMPORT_PATH "${qml2ImportPath}" \
|
||||||
|
--set QT_PLUGIN_PATH "${qtbase.bin}/${qtbase.qtPluginPrefix}"
|
||||||
'';
|
'';
|
||||||
|
|
||||||
meta = {
|
meta = {
|
||||||
|
Loading…
x
Reference in New Issue
Block a user