diff options
| author | Maximilian Bosch <maximilian@mbosch.me> | 2018-08-08 17:55:43 +0200 |
|---|---|---|
| committer | Maximilian Bosch <maximilian@mbosch.me> | 2018-08-08 17:55:43 +0200 |
| commit | 09e58bc4e71a11e674a6aa2a506d8c4024eba5d6 (patch) | |
| tree | 6521f97ce9031b58c8dbb381957dd4f8e947530e /pkgs/applications/networking/instant-messengers | |
| parent | eb0207f13203dbf1675b3caa7c17dbce8c9d3e94 (diff) | |
| download | nixlib-09e58bc4e71a11e674a6aa2a506d8c4024eba5d6.tar nixlib-09e58bc4e71a11e674a6aa2a506d8c4024eba5d6.tar.gz nixlib-09e58bc4e71a11e674a6aa2a506d8c4024eba5d6.tar.bz2 nixlib-09e58bc4e71a11e674a6aa2a506d8c4024eba5d6.tar.lz nixlib-09e58bc4e71a11e674a6aa2a506d8c4024eba5d6.tar.xz nixlib-09e58bc4e71a11e674a6aa2a506d8c4024eba5d6.tar.zst nixlib-09e58bc4e71a11e674a6aa2a506d8c4024eba5d6.zip | |
weechat-xmpp: create proper runtime environment
The `weechat-xmpp` plugin requires `pydns` to properly resolve the XMPP host. Furthermore it's much easier to use substituteAll rather than messing around with substituteInPlace in a patched file.
Diffstat (limited to 'pkgs/applications/networking/instant-messengers')
| -rw-r--r-- | pkgs/applications/networking/instant-messengers/weechat-xmpp/default.nix | 17 | ||||
| -rw-r--r-- | pkgs/applications/networking/instant-messengers/weechat-xmpp/libpath.patch | 2 |
2 files changed, 9 insertions, 10 deletions
diff --git a/pkgs/applications/networking/instant-messengers/weechat-xmpp/default.nix b/pkgs/applications/networking/instant-messengers/weechat-xmpp/default.nix index 8c7e80b3ff8d..4b92d1212c55 100644 --- a/pkgs/applications/networking/instant-messengers/weechat-xmpp/default.nix +++ b/pkgs/applications/networking/instant-messengers/weechat-xmpp/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, xmpppy }: +{ stdenv, fetchFromGitHub, xmpppy, pydns, substituteAll, buildEnv }: stdenv.mkDerivation { name = "weechat-jabber-2017-08-30"; @@ -15,15 +15,14 @@ stdenv.mkDerivation { cp jabber.py $out/share/jabber.py ''; - buildInputs = [ xmpppy ]; - - postPatch = '' - substituteInPlace jabber.py \ - --replace "__NIX_OUTPUT__" "${xmpppy}/lib/python2.7/site-packages" - ''; - patches = [ - ./libpath.patch + (substituteAll { + src = ./libpath.patch; + env = "${buildEnv { + name = "weechat-xmpp-env"; + paths = [ pydns xmpppy ]; + }}/lib/python2.7/site-packages"; + }) ]; meta = with stdenv.lib; { diff --git a/pkgs/applications/networking/instant-messengers/weechat-xmpp/libpath.patch b/pkgs/applications/networking/instant-messengers/weechat-xmpp/libpath.patch index d3faab33a8e5..372c83944a27 100644 --- a/pkgs/applications/networking/instant-messengers/weechat-xmpp/libpath.patch +++ b/pkgs/applications/networking/instant-messengers/weechat-xmpp/libpath.patch @@ -8,7 +8,7 @@ index 27006a3..e53c2c0 100644 +import sys + -+sys.path.append('__NIX_OUTPUT__') ++sys.path.append('@env@') + + import_ok = True |