forked from mirrors/nixpkgs
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
This commit is contained in:
parent
dc6f1cf4b3
commit
cc174b3d55
|
@ -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;
|
||||
}
|
||||
|
||||
|
|
|
@ -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
|
||||
|
|
|
@ -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 = [];
|
||||
};
|
||||
|
||||
|
|
Loading…
Reference in a new issue