mirror of
https://github.com/NixOS/nixpkgs.git
synced 2024-11-22 21:50:55 +00:00
Merge pull request #62743 from geistesk/weechat-otr-1.9.2
weechatScripts.weechat-otr: init at 1.9.2
This commit is contained in:
commit
85de89db86
|
@ -14,4 +14,8 @@
|
|||
};
|
||||
|
||||
weechat-autosort = callPackage ./weechat-autosort { };
|
||||
|
||||
weechat-otr = callPackage ./weechat-otr {
|
||||
inherit pythonPackages;
|
||||
};
|
||||
}
|
||||
|
|
|
@ -0,0 +1,64 @@
|
|||
{ stdenv, substituteAll, buildEnv, fetchgit, fetchFromGitHub, pythonPackages, gmp }:
|
||||
|
||||
let
|
||||
# pure-python-otr (potr) requires an older version of pycrypto, which is
|
||||
# not compatible with pycryptodome. Therefore, the latest patched version
|
||||
# of pycrypto will be fetched from the Debian project.
|
||||
# https://security-tracker.debian.org/tracker/source-package/python-crypto
|
||||
|
||||
pycrypto = pythonPackages.buildPythonPackage rec {
|
||||
pname = "pycrypto";
|
||||
version = "2.6.1-10";
|
||||
|
||||
src = fetchgit {
|
||||
url = "https://salsa.debian.org/sramacher/python-crypto.git";
|
||||
rev = "debian/${version}";
|
||||
sha256 = "10rgq8bmjfpiqqa1g1p1hh7pxlxs7x0nawvk6zip0pd6x2vsr661";
|
||||
};
|
||||
|
||||
buildInputs = [ gmp ];
|
||||
|
||||
preConfigure = ''
|
||||
sed -i 's,/usr/include,/no-such-dir,' configure
|
||||
sed -i "s!,'/usr/include/'!!" setup.py
|
||||
'';
|
||||
};
|
||||
|
||||
potr = pythonPackages.potr.overridePythonAttrs (oldAttrs: {
|
||||
propagatedBuildInputs = [ pycrypto ];
|
||||
});
|
||||
in stdenv.mkDerivation rec {
|
||||
pname = "weechat-otr";
|
||||
version = "1.9.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
repo = pname;
|
||||
owner = "mmb";
|
||||
rev = "v${version}";
|
||||
sha256 = "1lngv98y6883vk8z2628cl4d5y8jxy39w8245gjdvshl8g18k5s2";
|
||||
};
|
||||
|
||||
patches = [
|
||||
(substituteAll {
|
||||
src = ./libpath.patch;
|
||||
env = "${buildEnv {
|
||||
name = "weechat-otr-env";
|
||||
paths = [ potr pycrypto ];
|
||||
}}/${pythonPackages.python.sitePackages}";
|
||||
})
|
||||
];
|
||||
|
||||
passthru.scripts = [ "weechat_otr.py" ];
|
||||
|
||||
installPhase = ''
|
||||
mkdir -p $out/share
|
||||
cp weechat_otr.py $out/share/weechat_otr.py
|
||||
'';
|
||||
|
||||
meta = with stdenv.lib; {
|
||||
homepage = "https://github.com/mmb/weechat-otr";
|
||||
license = licenses.gpl3;
|
||||
maintainers = with maintainers; [ geistesk ];
|
||||
description = "WeeChat script for Off-the-Record messaging";
|
||||
};
|
||||
}
|
|
@ -0,0 +1,13 @@
|
|||
diff --git a/weechat_otr.py b/weechat_otr.py
|
||||
index 0ccfb35..c42bebf 100644
|
||||
--- a/weechat_otr.py
|
||||
+++ b/weechat_otr.py
|
||||
@@ -41,6 +41,8 @@ import shlex
|
||||
import shutil
|
||||
import sys
|
||||
|
||||
+sys.path.append('@env@')
|
||||
+
|
||||
import potr
|
||||
import weechat
|
||||
|
Loading…
Reference in a new issue