diff options
| author | worldofpeace <worldofpeace@protonmail.ch> | 2019-08-30 23:29:39 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-08-30 23:29:39 -0400 |
| commit | 1a4903aa05687405878834929ab8090d2b6b23f4 (patch) | |
| tree | 38c72628e87c9dfe62c68ab382564f47a4a5438c /pkgs | |
| parent | 41a3746a90de9aafacc0f2eda48efd6f9c754728 (diff) | |
| parent | bd1e4424e51ec3240933377f0746c4e9d10e856e (diff) | |
| download | nixpkgs-1a4903aa05687405878834929ab8090d2b6b23f4.tar nixpkgs-1a4903aa05687405878834929ab8090d2b6b23f4.tar.gz nixpkgs-1a4903aa05687405878834929ab8090d2b6b23f4.tar.bz2 nixpkgs-1a4903aa05687405878834929ab8090d2b6b23f4.tar.lz nixpkgs-1a4903aa05687405878834929ab8090d2b6b23f4.tar.xz nixpkgs-1a4903aa05687405878834929ab8090d2b6b23f4.tar.zst nixpkgs-1a4903aa05687405878834929ab8090d2b6b23f4.zip | |
Merge pull request #67802 from rnhmjoj/monero
monero-gui: cleanup
Diffstat (limited to 'pkgs')
| -rw-r--r-- | pkgs/applications/blockchains/monero-gui/default.nix | 27 |
1 files changed, 6 insertions, 21 deletions
diff --git a/pkgs/applications/blockchains/monero-gui/default.nix b/pkgs/applications/blockchains/monero-gui/default.nix index aaff39f1c6b..92f6f008021 100644 --- a/pkgs/applications/blockchains/monero-gui/default.nix +++ b/pkgs/applications/blockchains/monero-gui/default.nix @@ -1,5 +1,4 @@ -{ stdenv, fetchFromGitHub -, wrapQtAppsHook, makeDesktopItem +{ mkDerivation, lib, makeDesktopItem, fetchFromGitHub , qtbase, qmake, qtmultimedia, qttools , qtgraphicaleffects, qtdeclarative , qtlocation, qtquickcontrols, qtquickcontrols2 @@ -9,22 +8,10 @@ , hidapi }: -with stdenv.lib; +with 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 { - name = "monero-gui-${version}"; +mkDerivation rec { + pname = "monero-gui"; version = "0.14.1.2"; src = fetchFromGitHub { @@ -34,7 +21,7 @@ stdenv.mkDerivation rec { sha256 = "1rm043r6y2mzy8pclnzbjjfxgps8pkfa2b92p66k8y8rdmgq6m1k"; }; - nativeBuildInputs = [ qmake pkgconfig wrapQtAppsHook ]; + nativeBuildInputs = [ qmake pkgconfig ]; buildInputs = [ qtbase qtmultimedia qtgraphicaleffects @@ -46,9 +33,7 @@ stdenv.mkDerivation rec { cppzmq hidapi ]; - patches = [ - ./move-log-file.patch - ]; + patches = [ ./move-log-file.patch ]; postPatch = '' echo ' |