Merge pull request #28824 from mguentner/pybitmessage

pybitmessage: 0.4.4 -> 0.6.2

authored by Jörg Thalheim and committed by GitHub e316930b 4ae12f09

+14 -15
+14 -15
pkgs/applications/networking/instant-messengers/pybitmessage/default.nix
··· 1 1 { stdenv, fetchFromGitHub, pythonPackages, openssl }: 2 2 3 - stdenv.mkDerivation rec { 3 + pythonPackages.buildPythonApplication rec { 4 4 name = "pybitmessage-${version}"; 5 5 6 - version = "0.4.4"; 6 + version = "0.6.2"; 7 7 8 8 src = fetchFromGitHub { 9 9 owner = "bitmessage"; 10 10 repo = "PyBitmessage"; 11 11 rev = "v${version}"; 12 - sha256 = "1f4h0yc1mfjnxzvxiv9hxgak59mgr3a5ykv50vlyiay82za20jax"; 12 + sha256 = "04sgns9qczzw2152gqdr6bjyy4fmgs26cz8n3qck94l0j51rxhz8"; 13 13 }; 14 14 15 - buildInputs = with pythonPackages; [ python pyqt4 wrapPython ] ++ [ openssl ]; 15 + propagatedBuildInputs = with pythonPackages; [ msgpack pyqt4 ] ++ [ openssl ]; 16 16 17 17 preConfigure = '' 18 - substituteInPlace Makefile \ 19 - --replace "PREFIX?=/usr/local" "" \ 20 - --replace "/usr" "" 21 - ''; 18 + # Remove interaction and misleading output 19 + substituteInPlace setup.py \ 20 + --replace "nothing = raw_input()" pass \ 21 + --replace 'print "It looks like building the package failed.\n" \' pass \ 22 + --replace ' "You may be missing a C++ compiler and the OpenSSL headers."' pass 23 + 24 + substituteInPlace src/pyelliptic/openssl.py \ 25 + --replace "libdir.append(find_library('ssl'))" "libdir.append('${openssl.out}/lib/libssl.so')" 22 26 23 - makeFlags = [ "DESTDIR=$(out)" ]; 27 + substituteInPlace src/depends.py \ 28 + --replace "ctypes.util.find_library('ssl')" "'${openssl.out}/lib/libssl.so'" 24 29 25 - postInstall = '' 26 - substituteInPlace $out/bin/pybitmessage \ 27 - --replace "exec python2" "exec ${pythonPackages.python}/bin/python" \ 28 - --replace "/opt/openssl-compat-bitcoin/lib/" "${openssl.out}/lib/" 29 - wrapProgram $out/bin/pybitmessage \ 30 - --prefix PYTHONPATH : "$(toPythonPath $out):$PYTHONPATH" 31 30 ''; 32 31 33 32 meta = with stdenv.lib; {