diff options
| author | Arseniy Seroka <jagajaga@users.noreply.github.com> | 2016-05-12 15:00:37 +0300 |
|---|---|---|
| committer | Arseniy Seroka <jagajaga@users.noreply.github.com> | 2016-05-12 15:00:37 +0300 |
| commit | fd12b1149e8ee55d20898d49a2f330ddd75063ea (patch) | |
| tree | 3a41ad787cd368f642f2d506685365c02c9d8677 /pkgs/applications | |
| parent | 639dcffa0bd7a5068a86bd41705d9a84e6267c32 (diff) | |
| parent | 9d9a20e98b79da37459825a9c2ad08336bda680c (diff) | |
| download | nixpkgs-fd12b1149e8ee55d20898d49a2f330ddd75063ea.tar nixpkgs-fd12b1149e8ee55d20898d49a2f330ddd75063ea.tar.gz nixpkgs-fd12b1149e8ee55d20898d49a2f330ddd75063ea.tar.bz2 nixpkgs-fd12b1149e8ee55d20898d49a2f330ddd75063ea.tar.lz nixpkgs-fd12b1149e8ee55d20898d49a2f330ddd75063ea.tar.xz nixpkgs-fd12b1149e8ee55d20898d49a2f330ddd75063ea.tar.zst nixpkgs-fd12b1149e8ee55d20898d49a2f330ddd75063ea.zip | |
Merge pull request #15398 from Shados/maintain-opensteamworks
Allow plugins to work for Finch (CLI Pidgin)
Diffstat (limited to 'pkgs/applications')
| -rw-r--r-- | pkgs/applications/networking/instant-messengers/pidgin-plugins/pidgin-opensteamworks/default.nix | 4 | ||||
| -rw-r--r-- | pkgs/applications/networking/instant-messengers/pidgin/wrapper.nix | 3 |
2 files changed, 5 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/ ''; 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} ''; } |