jolheiser/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

pidgin: simplify using the wrapped version

Browse Source 
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:
Vladimír Čunát 2016-06-09 12:19:44 +02:00
parent dc6f1cf4b3
commit cc174b3d55
3 changed files with 11 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
pkgs/applications/networking/instant-messengers/pidgin/default.nix
View File

@ -6,11 +6,12 @@
, openssl ? null , openssl ? null
, gnutls ? null , gnutls ? null
, libgcrypt ? null , libgcrypt ? null
, plugins, symlinkJoin
}: }:
# FIXME: clean the mess around choosing the SSL library (nss by default) # FIXME: clean the mess around choosing the SSL library (nss by default)
stdenv.mkDerivation rec { let unwrapped = stdenv.mkDerivation rec {
name = "pidgin-${version}"; name = "pidgin-${version}";
majorVersion = "2"; majorVersion = "2";
version = "${majorVersion}.10.11"; version = "${majorVersion}.10.11";
@ -68,4 +69,11 @@ stdenv.mkDerivation rec {
platforms = platforms.linux; platforms = platforms.linux;
maintainers = [ maintainers.vcunat ]; maintainers = [ maintainers.vcunat ];
}; };
} };
in if plugins == [] then unwrapped
else import ./wrapper.nix {
inherit stdenv makeWrapper symlinkJoin plugins;
pidgin = unwrapped;
}

1
pkgs/top-level/aliases.nix
View File

@ -73,6 +73,7 @@ doNotDisplayTwice rec {
mupen64plus1_5 = mupen64plus; # added 2016-02-12 mupen64plus1_5 = mupen64plus; # added 2016-02-12
ncat = nmap; # added 2016-01-26 ncat = nmap; # added 2016-01-26
nfsUtils = nfs-utils; # added 2014-12-06 nfsUtils = nfs-utils; # added 2014-12-06
pidgin-with-plugins = pidgin; # added 2016-06
pidginlatexSF = pidginlatex; # added 2014-11-02 pidginlatexSF = pidginlatex; # added 2014-11-02
poppler_qt5 = qt5.poppler; # added 2015-12-19 poppler_qt5 = qt5.poppler; # added 2015-12-19
qca-qt5 = qt5.qca-qt5; # added 2015-12-19 qca-qt5 = qt5.qca-qt5; # added 2015-12-19

3
pkgs/top-level/all-packages.nix
View File

@ -13809,9 +13809,6 @@ in
gnutls = if config.pidgin.gnutls or false then gnutls else null; gnutls = if config.pidgin.gnutls or false then gnutls else null;
libgcrypt = if config.pidgin.gnutls or false then libgcrypt else null; libgcrypt = if config.pidgin.gnutls or false then libgcrypt else null;
startupnotification = libstartup_notification; startupnotification = libstartup_notification;
};
pidgin-with-plugins = callPackage ../applications/networking/instant-messengers/pidgin/wrapper.nix {
plugins = []; plugins = [];
}; };