about summary refs log tree commit diff
diff options
context:
space:
mode:
authorBjørn Forsman <bjorn.forsman@gmail.com>2014-10-26 11:34:05 +0100
committerBjørn Forsman <bjorn.forsman@gmail.com>2014-10-26 11:51:09 +0100
commit71d4380a4182eb56f9254dc240caa78882b08eb2 (patch)
treee6bcaa2dc158d9de13db6dff6c239ce7bd025d87
parent03c6159efe06459cd0b8f0887bd36164f12f99d5 (diff)
pidgin-with-plugins: fix version number placement in pkg name
Currently the pidgin plugins wrapper is named
"pidgin-VERSION-with-plugins". Fix it so that it becomes
"pidgin-with-plugins-VERSION".

(And add missing newline at the end of file.)
-rw-r--r--pkgs/applications/networking/instant-messengers/pidgin/wrapper.nix4
1 files changed, 2 insertions, 2 deletions
diff --git a/pkgs/applications/networking/instant-messengers/pidgin/wrapper.nix b/pkgs/applications/networking/instant-messengers/pidgin/wrapper.nix
index a10eb6864cca4..3af2166f4a69d 100644
--- a/pkgs/applications/networking/instant-messengers/pidgin/wrapper.nix
+++ b/pkgs/applications/networking/instant-messengers/pidgin/wrapper.nix
@@ -1,7 +1,7 @@
 { stdenv, buildEnv, pidgin, makeWrapper, plugins }:
 
 let drv = buildEnv {
-  name = "${pidgin.name}-with-plugins";
+  name = "pidgin-with-plugins-" + (builtins.parseDrvName pidgin.name).version;
 
   paths = [ pidgin ] ++ plugins;
 
@@ -18,4 +18,4 @@ let drv = buildEnv {
       --suffix-each PURPLE_PLUGIN_PATH ':' "$out/lib/purple-${pidgin.majorVersion} $out/lib/pidgin"
   '';
   };
-in stdenv.lib.overrideDerivation drv (x : { buildInputs = x.buildInputs ++ [ makeWrapper ]; })
\ No newline at end of file
+in stdenv.lib.overrideDerivation drv (x : { buildInputs = x.buildInputs ++ [ makeWrapper ]; })