From 71d4380a4182eb56f9254dc240caa78882b08eb2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B8rn=20Forsman?= Date: Sun, 26 Oct 2014 11:34:05 +0100 Subject: [PATCH] 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.) --- .../networking/instant-messengers/pidgin/wrapper.nix | 4 ++-- 1 file 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 a10eb6864cca..3af2166f4a69 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 ]; })