diff options
| author | Sergei Trofimovich <slyich@gmail.com> | 2021-11-12 13:49:01 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-11-12 14:49:01 +0100 |
| commit | 67a769d2f5b5b7985642f09e33b15cf2ab1ba987 (patch) | |
| tree | 407b5beb1d559e785791f54db83bfd748a55e585 /pkgs/applications/networking/instant-messengers/pidgin | |
| parent | 8d85dc628f899db1f7899e16fa1ddf8e03936ee2 (diff) | |
pidgin-with-plugins: fix evaluation failure in use of non-existent 'm… (#145321)
Diffstat (limited to 'pkgs/applications/networking/instant-messengers/pidgin')
| -rw-r--r-- | pkgs/applications/networking/instant-messengers/pidgin/default.nix | 6 | ||||
| -rw-r--r-- | pkgs/applications/networking/instant-messengers/pidgin/wrapper.nix | 6 |
2 files changed, 6 insertions, 6 deletions
diff --git a/pkgs/applications/networking/instant-messengers/pidgin/default.nix b/pkgs/applications/networking/instant-messengers/pidgin/default.nix index dd9bcd878d9d1..bd6febeaf9d13 100644 --- a/pkgs/applications/networking/instant-messengers/pidgin/default.nix +++ b/pkgs/applications/networking/instant-messengers/pidgin/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, makeWrapper, pkg-config, gtk2, gtk2-x11, gtkspell2, aspell +{ callPackage, stdenv, fetchurl, makeWrapper, pkg-config, gtk2, gtk2-x11, gtkspell2, aspell , gst_all_1, libstartup_notification, gettext, perlPackages, libxml2, nss , nspr, farstream, libXScrnSaver, avahi, dbus, dbus-glib, intltool, libidn , lib, python3, libICE, libXext, libSM, libgnt, ncurses, cyrus_sasl, openssl @@ -93,7 +93,7 @@ let unwrapped = stdenv.mkDerivation rec { }; in if plugins == [] then unwrapped - else import ./wrapper.nix { - inherit makeWrapper symlinkJoin plugins; + else callPackage ./wrapper.nix { + inherit plugins; pidgin = unwrapped; } diff --git a/pkgs/applications/networking/instant-messengers/pidgin/wrapper.nix b/pkgs/applications/networking/instant-messengers/pidgin/wrapper.nix index 095f838fe981e..d5641c24fb07a 100644 --- a/pkgs/applications/networking/instant-messengers/pidgin/wrapper.nix +++ b/pkgs/applications/networking/instant-messengers/pidgin/wrapper.nix @@ -1,4 +1,4 @@ -{ symlinkJoin, pidgin, makeWrapper, plugins }: +{ lib, symlinkJoin, pidgin, makeWrapper, plugins }: let extraArgs = map (x: x.wrapArgs or "") plugins; @@ -11,10 +11,10 @@ in symlinkJoin { postBuild = '' wrapProgram $out/bin/pidgin \ - --suffix-each PURPLE_PLUGIN_PATH ':' "$out/lib/purple-${pidgin.majorVersion} $out/lib/pidgin" \ + --suffix-each PURPLE_PLUGIN_PATH ':' "$out/lib/purple-${lib.versions.major pidgin.version} $out/lib/pidgin" \ ${toString extraArgs} wrapProgram $out/bin/finch \ - --suffix-each PURPLE_PLUGIN_PATH ':' "$out/lib/purple-${pidgin.majorVersion}" \ + --suffix-each PURPLE_PLUGIN_PATH ':' "$out/lib/purple-${lib.versions.major pidgin.version}" \ ${toString extraArgs} ''; } |