diff options
author | Benjamin Hipple <bhipple@protonmail.com> | 2020-07-05 21:00:02 -0400 |
---|---|---|
committer | GitHub <noreply@github.com> | 2020-07-05 21:00:02 -0400 |
commit | f9aa6fa2cdccbc80a624ec387515edcdba67a374 (patch) | |
tree | 0c0879908eadcdfb0246bd06b09c365ec1c14d8b | |
parent | 9d0c8eb8013208c1498b2f625a7bfa1073ed0497 (diff) | |
parent | 711146caeb2a4bf86d54951a16fb882d3a28a402 (diff) | |
download | nixpkgs-f9aa6fa2cdccbc80a624ec387515edcdba67a374.tar nixpkgs-f9aa6fa2cdccbc80a624ec387515edcdba67a374.tar.gz nixpkgs-f9aa6fa2cdccbc80a624ec387515edcdba67a374.tar.bz2 nixpkgs-f9aa6fa2cdccbc80a624ec387515edcdba67a374.tar.lz nixpkgs-f9aa6fa2cdccbc80a624ec387515edcdba67a374.tar.xz nixpkgs-f9aa6fa2cdccbc80a624ec387515edcdba67a374.tar.zst nixpkgs-f9aa6fa2cdccbc80a624ec387515edcdba67a374.zip |
Merge pull request #90313 from wucke13/pivx
pivx: 4.0.2 -> 4.1.1
-rw-r--r-- | pkgs/applications/blockchains/pivx.nix | 13 |
1 files changed, 4 insertions, 9 deletions
diff --git a/pkgs/applications/blockchains/pivx.nix b/pkgs/applications/blockchains/pivx.nix index 600e462b390..16ea2dc43e7 100644 --- a/pkgs/applications/blockchains/pivx.nix +++ b/pkgs/applications/blockchains/pivx.nix @@ -1,5 +1,5 @@ { fetchFromGitHub, stdenv, pkgconfig, autoreconfHook, wrapQtAppsHook ? null -, openssl_1_0_2, db48, boost, zlib, miniupnpc, gmp +, openssl, db48, boost, zlib, miniupnpc, gmp , qrencode, glib, protobuf, yasm, libevent , utillinux, qtbase ? null, qttools ? null , enableUpnp ? false @@ -10,17 +10,17 @@ with stdenv.lib; stdenv.mkDerivation rec { name = "pivx-${version}"; - version = "4.0.2"; + version = "4.1.1"; src = fetchFromGitHub { owner = "PIVX-Project"; repo= "PIVX"; rev = "v${version}"; - sha256 = "12lnp318k8dx1sar24zfmv2imnzs30srssnlpb31y7hcxhz0wpc5"; + sha256 = "03ndk46h6093v8s18d5iffz48zhlshq7jrk6vgpjfs6z2iqgd2sy"; }; nativeBuildInputs = [ pkgconfig autoreconfHook ] ++ optionals withGui [ wrapQtAppsHook ]; - buildInputs = [ glib gmp openssl_1_0_2 db48 yasm boost zlib libevent miniupnpc protobuf utillinux ] + buildInputs = [ glib gmp openssl db48 yasm boost zlib libevent miniupnpc protobuf utillinux ] ++ optionals withGui [ qtbase qttools qrencode ]; configureFlags = [ "--with-boost-libdir=${boost.out}/lib" ] @@ -28,7 +28,6 @@ stdenv.mkDerivation rec { ++ optional disableWallet "--disable-wallet" ++ optional disableDaemon "--disable-daemon" ++ optionals withGui [ "--with-gui=yes" - "--with-unsupported-ssl" # TODO remove this ASAP "--with-qt-bindir=${qtbase.dev}/bin:${qttools.dev}/bin" ]; @@ -56,9 +55,5 @@ stdenv.mkDerivation rec { homepage = "https://www.dash.org"; maintainers = with maintainers; [ wucke13 ]; platforms = platforms.unix; - # TODO - # upstream doesn't support newer openssl versions - # https://github.com/PIVX-Project/PIVX/issues/748 - # openssl_1_0_2 should be replaced with openssl ASAP }; } |