pivx: cleanup, format

+39 -17
+36 -17
pkgs/applications/blockchains/pivx/default.nix
··· 1 - { fetchFromGitHub, lib, stdenv, pkg-config, autoreconfHook, wrapQtAppsHook ? null 2 - , openssl, db48, boost, zlib, miniupnpc, gmp 3 - , qrencode, glib, protobuf, yasm, libevent 4 - , util-linux, qtbase ? null, qttools ? null 1 + { fetchFromGitHub 2 + , lib 3 + , stdenv 4 + , pkg-config 5 + , autoreconfHook 6 + , wrapQtAppsHook 7 + , openssl 8 + , db48 9 + , boost 10 + , zlib 11 + , miniupnpc 12 + , gmp 13 + , qrencode 14 + , glib 15 + , protobuf 16 + , yasm 17 + , libevent 18 + , util-linux 19 + , qtbase 20 + , qttools 5 21 , enableUpnp ? false 6 22 , disableWallet ? false 7 23 , disableDaemon ? false 8 - , withGui ? false }: 24 + , withGui ? false 25 + }: 9 26 10 - with lib; 11 27 stdenv.mkDerivation rec { 12 - name = "pivx-${version}"; 28 + pname = "pivx"; 13 29 version = "4.1.1"; 14 30 15 31 src = fetchFromGitHub { 16 32 owner = "PIVX-Project"; 17 - repo= "PIVX"; 33 + repo = "PIVX"; 18 34 rev = "v${version}"; 19 35 sha256 = "03ndk46h6093v8s18d5iffz48zhlshq7jrk6vgpjfs6z2iqgd2sy"; 20 36 }; 21 37 22 - nativeBuildInputs = [ pkg-config autoreconfHook ] ++ optionals withGui [ wrapQtAppsHook ]; 38 + nativeBuildInputs = [ pkg-config autoreconfHook ] 39 + ++ lib.optionals withGui [ wrapQtAppsHook ]; 40 + 23 41 buildInputs = [ glib gmp openssl db48 yasm boost zlib libevent miniupnpc protobuf util-linux ] 24 - ++ optionals withGui [ qtbase qttools qrencode ]; 42 + ++ lib.optionals withGui [ qtbase qttools qrencode ]; 25 43 26 44 configureFlags = [ "--with-boost-libdir=${boost.out}/lib" ] 27 - ++ optional enableUpnp "--enable-upnp-default" 28 - ++ optional disableWallet "--disable-wallet" 29 - ++ optional disableDaemon "--disable-daemon" 30 - ++ optionals withGui [ "--with-gui=yes" 31 - "--with-qt-bindir=${qtbase.dev}/bin:${qttools.dev}/bin" 32 - ]; 45 + ++ lib.optional enableUpnp "--enable-upnp-default" 46 + ++ lib.optional disableWallet "--disable-wallet" 47 + ++ lib.optional disableDaemon "--disable-daemon" 48 + ++ lib.optionals withGui [ 49 + "--with-gui=yes" 50 + "--with-qt-bindir=${lib.getDev qtbase}/bin:${lib.getDev qttools}/bin" 51 + ]; 33 52 34 53 enableParallelBuilding = true; 35 - doChecks = true; 54 + doCheck = true; 36 55 postBuild = '' 37 56 mkdir -p $out/share/applications $out/share/icons 38 57 cp contrib/debian/pivx-qt.desktop $out/share/applications/
+3
pkgs/top-level/all-packages.nix
··· 28786 28786 pivx = libsForQt5.callPackage ../applications/blockchains/pivx { withGui = true; }; 28787 28787 pivxd = callPackage ../applications/blockchains/pivx { 28788 28788 withGui = false; 28789 + qtbase = null; 28790 + qttools = null; 28791 + wrapQtAppsHook = null; 28789 28792 autoreconfHook = buildPackages.autoreconfHook269; 28790 28793 }; 28791 28794