monero-gui: cleanup for qt wrappers

This commit is contained in:
rnhmjoj 2019-08-31 01:39:25 +02:00 committed by worldofpeace
parent eedf3dc6e2
commit bd1e4424e5

View File

@ -1,5 +1,4 @@
{ stdenv, fetchFromGitHub { mkDerivation, lib, makeDesktopItem, fetchFromGitHub
, wrapQtAppsHook, makeDesktopItem
, qtbase, qmake, qtmultimedia, qttools , qtbase, qmake, qtmultimedia, qttools
, qtgraphicaleffects, qtdeclarative , qtgraphicaleffects, qtdeclarative
, qtlocation, qtquickcontrols, qtquickcontrols2 , qtlocation, qtquickcontrols, qtquickcontrols2
@ -9,22 +8,10 @@
, hidapi , hidapi
}: }:
with stdenv.lib; with lib;
let mkDerivation rec {
qmlPath = qmlLib: "${qmlLib}/${qtbase.qtQmlPrefix}"; pname = "monero-gui";
qml2ImportPath = concatMapStringsSep ":" qmlPath [
qtbase.bin qtmultimedia.bin qtgraphicaleffects
qtdeclarative.bin qtlocation.bin
qtquickcontrols qtquickcontrols2.bin
qtwebchannel.bin qtwebengine.bin qtxmlpatterns
];
in
stdenv.mkDerivation rec {
name = "monero-gui-${version}";
version = "0.14.1.2"; version = "0.14.1.2";
src = fetchFromGitHub { src = fetchFromGitHub {
@ -34,7 +21,7 @@ stdenv.mkDerivation rec {
sha256 = "1rm043r6y2mzy8pclnzbjjfxgps8pkfa2b92p66k8y8rdmgq6m1k"; sha256 = "1rm043r6y2mzy8pclnzbjjfxgps8pkfa2b92p66k8y8rdmgq6m1k";
}; };
nativeBuildInputs = [ qmake pkgconfig wrapQtAppsHook ]; nativeBuildInputs = [ qmake pkgconfig ];
buildInputs = [ buildInputs = [
qtbase qtmultimedia qtgraphicaleffects qtbase qtmultimedia qtgraphicaleffects
@ -46,9 +33,7 @@ stdenv.mkDerivation rec {
cppzmq hidapi cppzmq hidapi
]; ];
patches = [ patches = [ ./move-log-file.patch ];
./move-log-file.patch
];
postPatch = '' postPatch = ''
echo ' echo '