about summary refs log tree commit diff
diff options
context:
space:
mode:
authorAntoine R. Dumont <antoine.romain.dumont@gmail.com>2014-11-16 20:42:19 +0100
committerVladimír Čunát <vcunat@gmail.com>2014-11-17 09:27:55 +0100
commitcab722f816fd3ad6d2672a0c5e3754a9fb62358f (patch)
treed505332be820d69096a50b075633e6639a518331
parent48776868f7a6a0aa9139584b3425c441a429c018 (diff)
pidgin-with-plugins: fix plugin directories (close #5009)
-rw-r--r--pkgs/applications/networking/instant-messengers/pidgin/default.nix3
-rw-r--r--pkgs/applications/networking/instant-messengers/pidgin/wrapper.nix2
2 files changed, 3 insertions, 2 deletions
diff --git a/pkgs/applications/networking/instant-messengers/pidgin/default.nix b/pkgs/applications/networking/instant-messengers/pidgin/default.nix
index 32004496534fa..bcbc003b3d28a 100644
--- a/pkgs/applications/networking/instant-messengers/pidgin/default.nix
+++ b/pkgs/applications/networking/instant-messengers/pidgin/default.nix
@@ -12,7 +12,8 @@
 
 stdenv.mkDerivation rec {
   name = "pidgin-${version}";
-  version = "2.10.10";
+  majorVersion = "2";
+  version = "${majorVersion}.10.10";
 
   src = fetchurl {
     url = "mirror://sourceforge/pidgin/${name}.tar.bz2";
diff --git a/pkgs/applications/networking/instant-messengers/pidgin/wrapper.nix b/pkgs/applications/networking/instant-messengers/pidgin/wrapper.nix
index 0c498dd612e19..7e637c767cfaa 100644
--- a/pkgs/applications/networking/instant-messengers/pidgin/wrapper.nix
+++ b/pkgs/applications/networking/instant-messengers/pidgin/wrapper.nix
@@ -17,7 +17,7 @@ drv = buildEnv {
       done
     fi
     wrapProgram $out/bin/pidgin \
-      --suffix-each PURPLE_PLUGIN_PATH ':' "$out/lib/purple-${pidgin.version} $out/lib/pidgin" \
+      --suffix-each PURPLE_PLUGIN_PATH ':' "$out/lib/purple-${pidgin.majorVersion} $out/lib/pidgin" \
       ${toString extraArgs}
   '';
   };