From e634488cc3084445e5233de78d0cc6e118c2b33e Mon Sep 17 00:00:00 2001 From: Alexei Robyn Date: Mon, 4 Apr 2016 14:29:17 +1000 Subject: [PATCH 1/2] pidgin-with-plugins: Add plugin support for Finch, the CLI version of Pidgin. --- .../networking/instant-messengers/pidgin/wrapper.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pkgs/applications/networking/instant-messengers/pidgin/wrapper.nix b/pkgs/applications/networking/instant-messengers/pidgin/wrapper.nix index cff0f0818ee..914b3480a95 100644 --- a/pkgs/applications/networking/instant-messengers/pidgin/wrapper.nix +++ b/pkgs/applications/networking/instant-messengers/pidgin/wrapper.nix @@ -13,5 +13,8 @@ in symlinkJoin { wrapProgram $out/bin/pidgin \ --suffix-each PURPLE_PLUGIN_PATH ':' "$out/lib/purple-${pidgin.majorVersion} $out/lib/pidgin" \ ${toString extraArgs} + wrapProgram $out/bin/finch \ + --suffix-each PURPLE_PLUGIN_PATH ':' "$out/lib/purple-${pidgin.majorVersion}" \ + ${toString extraArgs} ''; } From 9d9a20e98b79da37459825a9c2ad08336bda680c Mon Sep 17 00:00:00 2001 From: Alexei Robyn Date: Mon, 4 Apr 2016 14:29:58 +1000 Subject: [PATCH 2/2] pidgin-opensteamworks: Change install location to work with Finch as well as Pidgin. --- .../pidgin-plugins/pidgin-opensteamworks/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/instant-messengers/pidgin-plugins/pidgin-opensteamworks/default.nix b/pkgs/applications/networking/instant-messengers/pidgin-plugins/pidgin-opensteamworks/default.nix index e4c0697605d..2324ad464ed 100644 --- a/pkgs/applications/networking/instant-messengers/pidgin-plugins/pidgin-opensteamworks/default.nix +++ b/pkgs/applications/networking/instant-messengers/pidgin-plugins/pidgin-opensteamworks/default.nix @@ -13,9 +13,9 @@ stdenv.mkDerivation rec { preConfigure = "cd steam-mobile"; postInstall = '' - mkdir -p $out/lib/pidgin/ + mkdir -p $out/lib/purple-2 mkdir -p $out/share/pixmaps/pidgin/protocols/ - cp libsteam.so $out/lib/pidgin/ + cp libsteam.so $out/lib/purple-2/ unzip releases/icons.zip -d $out/share/pixmaps/pidgin/protocols/ '';