From cc174b3d556945eff999efe44ab18dd7b3e99f76 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Thu, 9 Jun 2016 12:19:44 +0200 Subject: [PATCH] pidgin: simplify using the wrapped version Now only the `pidgin` attribute is exposed and it's wrapped based on whether the `plugins` parameter is overridden. Discussion: https://github.com/NixOS/nixpkgs/issues/8999#issuecomment-224851642 --- .../networking/instant-messengers/pidgin/default.nix | 12 ++++++++++-- pkgs/top-level/aliases.nix | 1 + 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 e7266a93350..9123f6b39ed 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 6a6ec785d7f..d866d385762 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 be992fdc737..bc8c8d3b362 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 = []; };