Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 6af317616e2a
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: a921f8a1d1da
Choose a head ref
  • 2 commits
  • 1 file changed
  • 2 contributors

Commits on Mar 27, 2019

  1. monero-gui: fix missing qml imports

    @rnhmjoj
    rnhmjoj committed Mar 27, 2019

    Verified

    This commit was signed with the committer’s verified signature.
    mcous Michael Cousins
    SSH Key Fingerprint: UxZNCZyffAbNsLAJTgbdqL9/VVV6vqYLIr2BrIOgOZ8
    Verified
    Learn about vigilant mode
    Copy the full SHA
    bbefa95 View commit details

  2. Merge pull request #57921 from rnhmjoj/monero 

    monero-gui: fix missing qml imports
    @infinisil
    infinisil authored Mar 27, 2019
    Copy the full SHA
    a921f8a View commit details
Showing with 21 additions and 3 deletions.
  1. +21 −3 pkgs/applications/altcoins/monero-gui/default.nix
24 changes: 21 additions & 3 deletions pkgs/applications/altcoins/monero-gui/default.nix
View file
Original file line number Diff line number Diff line change
@@ -2,15 +2,27 @@
, makeWrapper, makeDesktopItem
, qtbase, qmake, qtmultimedia, qttools
, qtgraphicaleffects, qtdeclarative
, qtlocation, qtquickcontrols2, qtwebchannel
, qtwebengine, qtx11extras, qtxmlpatterns
, qtlocation, qtquickcontrols, qtquickcontrols2
, qtwebchannel, qtwebengine, qtx11extras, qtxmlpatterns
, monero, unbound, readline, boost, libunwind
, libsodium, pcsclite, zeromq, cppzmq, pkgconfig
, hidapi
}:

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 {
name = "monero-gui-${version}";
version = "0.14.0.0";
@@ -26,7 +38,8 @@ stdenv.mkDerivation rec {

buildInputs = [
qtbase qtmultimedia qtgraphicaleffects
qtdeclarative qtlocation qtquickcontrols2
qtdeclarative qtlocation
qtquickcontrols qtquickcontrols2
qtwebchannel qtwebengine qtx11extras
qtxmlpatterns monero unbound readline
boost libunwind libsodium pcsclite zeromq
@@ -81,6 +94,11 @@ stdenv.mkDerivation rec {
cp $src/images/appicons/$size.png \
$out/share/icons/hicolor/$size/apps/monero.png
done;
# wrap runtime dependencies
wrapProgram $out/bin/monero-wallet-gui \
--set QML2_IMPORT_PATH "${qml2ImportPath}" \
--set QT_PLUGIN_PATH "${qtbase.bin}/${qtbase.qtPluginPrefix}"
'';

meta = {