From eeffa2202a6652e67a3fa2c6ba1234b2e963d530 Mon Sep 17 00:00:00 2001 From: Nikolay Amiantov Date: Sun, 17 Apr 2016 02:34:33 +0300 Subject: [PATCH] qtbitcointrader: move to qmake4Hook --- .../applications/misc/qtbitcointrader/default.nix | 15 ++++++++------- pkgs/top-level/all-packages.nix | 4 +--- 2 files changed, 9 insertions(+), 10 deletions(-) diff --git a/pkgs/applications/misc/qtbitcointrader/default.nix b/pkgs/applications/misc/qtbitcointrader/default.nix index 8b527463b228..7de4e3e55a19 100644 --- a/pkgs/applications/misc/qtbitcointrader/default.nix +++ b/pkgs/applications/misc/qtbitcointrader/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, qt }: +{ stdenv, fetchFromGitHub, qt4, qmake4Hook }: let version = "1.08.03"; @@ -13,23 +13,24 @@ stdenv.mkDerivation { sha256 = "0kxb0n11agqid0nyqdspfndm03b8l0nl8x4yx2hsrizs6m5z08h4"; }; - buildInputs = [ qt ]; + buildInputs = [ qt4 ]; + + nativeBuildHooks = [ qmake4Hook ]; postUnpack = "sourceRoot=\${sourceRoot}/src"; - configurePhase = '' - qmake \ - PREFIX=$out \ + preConfigure = '' + qmakeFlags="$qmakeFlags \ DESKTOPDIR=$out/share/applications \ ICONDIR=$out/share/pixmaps \ - QtBitcoinTrader_Desktop.pro + " ''; meta = with stdenv.lib; { description = "Secure bitcoin trading client"; homepage = https://centrabit.com/; license = licenses.lgpl3; - platforms = qt.meta.platforms; + platforms = qt4.meta.platforms; maintainers = [ maintainers.ehmry ]; }; } diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 90d766c925a7..7ed4d8859c7f 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -14584,9 +14584,7 @@ in qgroundcontrol = qt55.callPackage ../applications/science/robotics/qgroundcontrol { }; - qtbitcointrader = callPackage ../applications/misc/qtbitcointrader { - qt = qt4; - }; + qtbitcointrader = callPackage ../applications/misc/qtbitcointrader { }; pahole = callPackage ../development/tools/misc/pahole {};