cafkafk/nixpkgs
cafkafk/nixpkgs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 2

pidgin-with-plugins: fix evaluation failure in use of non-existent 'm… (#145321)

Browse source
This commit is contained in:
Sergei Trofimovich 2021-11-12 13:49:01 +00:00 committed by GitHub
parent 8d85dc628f
commit 67a769d2f5
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
pkgs/applications/networking/instant-messengers/pidgin/default.nix
View file

@ -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;
}

6
pkgs/applications/networking/instant-messengers/pidgin/wrapper.nix
View file

@ -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}
'';
}