diff options
author | Jörg Thalheim <Mic92@users.noreply.github.com> | 2020-03-26 07:22:40 +0000 |
---|---|---|
committer | GitHub <noreply@github.com> | 2020-03-26 07:22:40 +0000 |
commit | c7fc0ed352091fcb45e1a8e120c3c99b7f47faea (patch) | |
tree | 90cecd9bb52f97bfb7c5db42b559bd262731e884 /pkgs/applications | |
parent | 1de505db113712342af1de2a9bc16a914c37ea2d (diff) | |
parent | a2d9581ac8fb7dfb1be01764e8deb7f5e9b4587c (diff) |
Merge pull request #83339 from bdesham/wee-slack-2.5.0
weechatScripts.wee-slack: 2.4.0 -> 2.5.0
Diffstat (limited to 'pkgs/applications')
-rw-r--r-- | pkgs/applications/networking/irc/weechat/scripts/wee-slack/default.nix | 10 | ||||
-rw-r--r-- | pkgs/applications/networking/irc/weechat/scripts/wee-slack/hardcode-json-file-path.patch | 12 |
2 files changed, 20 insertions, 2 deletions
diff --git a/pkgs/applications/networking/irc/weechat/scripts/wee-slack/default.nix b/pkgs/applications/networking/irc/weechat/scripts/wee-slack/default.nix index 632a485381d0e..7b98630e85ee1 100644 --- a/pkgs/applications/networking/irc/weechat/scripts/wee-slack/default.nix +++ b/pkgs/applications/networking/irc/weechat/scripts/wee-slack/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "wee-slack"; - version = "2.4.0"; + version = "2.5.0"; src = fetchFromGitHub { repo = "wee-slack"; owner = "wee-slack"; rev = "v${version}"; - sha256 = "0h425ln5vv76zv41dccapyfbl8qmmflbpwmrd26knqyj8k24zfpr"; + sha256 = "0sxgi5fg8qvzqmxy7sdma6v0wj93xwh21av10n8nxvdskacw5dxz"; }; patches = [ @@ -19,13 +19,19 @@ stdenv.mkDerivation rec { paths = with python3Packages; [ websocket_client six ]; }}/${python3Packages.python.sitePackages}"; }) + ./hardcode-json-file-path.patch ]; + postPatch = '' + substituteInPlace wee_slack.py --subst-var out + ''; + passthru.scripts = [ "wee_slack.py" ]; installPhase = '' mkdir -p $out/share cp wee_slack.py $out/share/wee_slack.py + install -D -m 0444 weemoji.json $out/share/wee-slack/weemoji.json ''; meta = with stdenv.lib; { diff --git a/pkgs/applications/networking/irc/weechat/scripts/wee-slack/hardcode-json-file-path.patch b/pkgs/applications/networking/irc/weechat/scripts/wee-slack/hardcode-json-file-path.patch new file mode 100644 index 0000000000000..7413a9229ce65 --- /dev/null +++ b/pkgs/applications/networking/irc/weechat/scripts/wee-slack/hardcode-json-file-path.patch @@ -0,0 +1,12 @@ +--- a/wee_slack.py ++++ b/wee_slack.py +@@ -4560,8 +4560,7 @@ + + def load_emoji(): + try: +- DIR = w.info_get('weechat_dir', '') +- with open('{}/weemoji.json'.format(DIR), 'r') as ef: ++ with open('@out@/share/wee-slack/weemoji.json', 'r') as ef: + emojis = json.loads(ef.read()) + if 'emoji' in emojis: + print_error('The weemoji.json file is in an old format. Please update it.') |