diff options
| author | shak-mar <shakmar@openmailbox.org> | 2017-06-16 08:03:05 +0200 |
|---|---|---|
| committer | Maximilian Güntner <code@sourcediver.org> | 2017-09-01 14:49:56 +0200 |
| commit | e3d7c4ca194693b3c80734511e61719ea8d4ffb6 (patch) | |
| tree | b99e23a260a4155554b405827881494e7eafcb06 /pkgs/applications | |
| parent | d22c1c07196520c70c054e9dc127a37ce125a0d1 (diff) | |
| download | nixlib-e3d7c4ca194693b3c80734511e61719ea8d4ffb6.tar nixlib-e3d7c4ca194693b3c80734511e61719ea8d4ffb6.tar.gz nixlib-e3d7c4ca194693b3c80734511e61719ea8d4ffb6.tar.bz2 nixlib-e3d7c4ca194693b3c80734511e61719ea8d4ffb6.tar.lz nixlib-e3d7c4ca194693b3c80734511e61719ea8d4ffb6.tar.xz nixlib-e3d7c4ca194693b3c80734511e61719ea8d4ffb6.tar.zst nixlib-e3d7c4ca194693b3c80734511e61719ea8d4ffb6.zip | |
pybitmessage: 0.4.4 -> 0.6.2
squashed hashes: 3ee20b2de7c02761aeb7389821f31bbfb6626301 b9a3a3b6a25b998893a1d861849890792b9e664b (details -> #26616)
Diffstat (limited to 'pkgs/applications')
| -rw-r--r-- | pkgs/applications/networking/instant-messengers/pybitmessage/default.nix | 27 |
1 files changed, 12 insertions, 15 deletions
diff --git a/pkgs/applications/networking/instant-messengers/pybitmessage/default.nix b/pkgs/applications/networking/instant-messengers/pybitmessage/default.nix index ec4eb91d6ab1..582ff687d59b 100644 --- a/pkgs/applications/networking/instant-messengers/pybitmessage/default.nix +++ b/pkgs/applications/networking/instant-messengers/pybitmessage/default.nix @@ -1,33 +1,30 @@ { stdenv, fetchFromGitHub, pythonPackages, openssl }: -stdenv.mkDerivation rec { +pythonPackages.buildPythonApplication rec { name = "pybitmessage-${version}"; - version = "0.4.4"; + version = "0.6.2"; src = fetchFromGitHub { owner = "bitmessage"; repo = "PyBitmessage"; rev = "v${version}"; - sha256 = "1f4h0yc1mfjnxzvxiv9hxgak59mgr3a5ykv50vlyiay82za20jax"; + sha256 = "04sgns9qczzw2152gqdr6bjyy4fmgs26cz8n3qck94l0j51rxhz8"; }; - buildInputs = with pythonPackages; [ python pyqt4 wrapPython ] ++ [ openssl ]; + propagatedBuildInputs = with pythonPackages; [ msgpack pyqt4 ] ++ [ openssl ]; preConfigure = '' - substituteInPlace Makefile \ - --replace "PREFIX?=/usr/local" "" \ - --replace "/usr" "" - ''; + # Remove interaction and misleading output + substituteInPlace setup.py \ + --replace "nothing = raw_input()" pass \ + --replace 'print "It looks like building the package failed.\n" \' pass \ + --replace ' "You may be missing a C++ compiler and the OpenSSL headers."' pass - makeFlags = [ "DESTDIR=$(out)" ]; + ''; - postInstall = '' - substituteInPlace $out/bin/pybitmessage \ - --replace "exec python2" "exec ${pythonPackages.python}/bin/python" \ - --replace "/opt/openssl-compat-bitcoin/lib/" "${openssl.out}/lib/" - wrapProgram $out/bin/pybitmessage \ - --prefix PYTHONPATH : "$(toPythonPath $out):$PYTHONPATH" + makeWrapperArgs = '' + --prefix LD_LIBRARY_PATH : "${openssl.out}/lib/" ''; meta = with stdenv.lib; { |