diff options
| -rw-r--r-- | pkgs/applications/networking/instant-messengers/pidgin/default.nix | 12 | ||||
| -rw-r--r-- | pkgs/top-level/aliases.nix | 1 | ||||
| -rw-r--r-- | pkgs/top-level/all-packages.nix | 3 |
3 files changed, 11 insertions, 5 deletions
diff --git a/pkgs/applications/networking/instant-messengers/pidgin/default.nix b/pkgs/applications/networking/instant-messengers/pidgin/default.nix index e7266a93350be..9123f6b39ed78 100644 --- a/pkgs/applications/networking/instant-messengers/pidgin/default.nix +++ b/pkgs/applications/networking/instant-messengers/pidgin/default.nix @@ -6,11 +6,12 @@ , openssl ? null , gnutls ? null , libgcrypt ? null +, plugins, symlinkJoin }: # FIXME: clean the mess around choosing the SSL library (nss by default) -stdenv.mkDerivation rec { +let unwrapped = stdenv.mkDerivation rec { name = "pidgin-${version}"; majorVersion = "2"; version = "${majorVersion}.10.11"; @@ -68,4 +69,11 @@ stdenv.mkDerivation rec { platforms = platforms.linux; maintainers = [ maintainers.vcunat ]; }; -} +}; + +in if plugins == [] then unwrapped + else import ./wrapper.nix { + inherit stdenv makeWrapper symlinkJoin plugins; + pidgin = unwrapped; + } + diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index 6a6ec785d7f2b..d866d38576267 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -73,6 +73,7 @@ doNotDisplayTwice rec { mupen64plus1_5 = mupen64plus; # added 2016-02-12 ncat = nmap; # added 2016-01-26 nfsUtils = nfs-utils; # added 2014-12-06 + pidgin-with-plugins = pidgin; # added 2016-06 pidginlatexSF = pidginlatex; # added 2014-11-02 poppler_qt5 = qt5.poppler; # added 2015-12-19 qca-qt5 = qt5.qca-qt5; # added 2015-12-19 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index be992fdc7373a..bc8c8d3b362ac 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -13809,9 +13809,6 @@ in gnutls = if config.pidgin.gnutls or false then gnutls else null; libgcrypt = if config.pidgin.gnutls or false then libgcrypt else null; startupnotification = libstartup_notification; - }; - - pidgin-with-plugins = callPackage ../applications/networking/instant-messengers/pidgin/wrapper.nix { plugins = []; }; |