BoomMicrophone/nixpkgs-suyu
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

pidgin: remove ? null from inputs, format, cleanups

Browse source
This commit is contained in:
Sandro Jäckel 2021-11-01 15:23:49 +01:00 committed by Sandro Jäckel
parent 6a1312549f
commit d3ebcec8c4
No known key found for this signature in database
GPG key ID: 3AF5A43A3EECC2E5
2 changed files with 21 additions and 33 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -1,27 +1,18 @@
{ stdenv, fetchurl, makeWrapper, pkg-config, gtk2, gtk2-x11 { stdenv, fetchurl, makeWrapper, pkg-config, gtk2, gtk2-x11, gtkspell2, aspell
, gtkspell2, aspell , gst_all_1, libstartup_notification, gettext, perlPackages, libxml2, nss
, gst_all_1, startupnotification, gettext , nspr, farstream, libXScrnSaver, avahi, dbus, dbus-glib, intltool, libidn
, perlPackages, libxml2, nss, nspr, farstream , lib, python3, libICE, libXext, libSM, libgnt, ncurses, cyrus_sasl, openssl
, libXScrnSaver, avahi, dbus, dbus-glib, intltool, libidn , gnutls, libgcrypt, symlinkJoin, cacert, plugins, withOpenssl, withGnutls, withCyrus_sasl ? true
, lib, python3, libICE, libXext, libSM
, libgnt, ncurses
, cyrus_sasl ? null
, openssl ? null
, gnutls ? null
, libgcrypt ? null
, plugins, symlinkJoin
, cacert
}: }:
# FIXME: clean the mess around choosing the SSL library (nss by default) # FIXME: clean the mess around choosing the SSL library (nss by default)
let unwrapped = stdenv.mkDerivation rec { let unwrapped = stdenv.mkDerivation rec {
pname = "pidgin"; pname = "pidgin";
majorVersion = "2"; version = "2.14.8";
version = "${majorVersion}.14.8";
src = fetchurl { src = fetchurl {
url = "mirror://sourceforge/pidgin/${pname}-${version}.tar.bz2"; url = "mirror://sourceforge/pidgin/pidgin-${version}.tar.bz2";
sha256 = "1jjc15pfyw3012q5ffv7q4r88wv07ndqh0wakyxa2k0w4708b01z"; sha256 = "1jjc15pfyw3012q5ffv7q4r88wv07ndqh0wakyxa2k0w4708b01z";
}; };
@ -32,7 +23,7 @@ let unwrapped = stdenv.mkDerivation rec {
buildInputs = let buildInputs = let
python-with-dbus = python3.withPackages (pp: with pp; [ dbus-python ]); python-with-dbus = python3.withPackages (pp: with pp; [ dbus-python ]);
in [ in [
aspell startupnotification aspell libstartup_notification
gst_all_1.gstreamer gst_all_1.gst-plugins-base gst_all_1.gst-plugins-good gst_all_1.gstreamer gst_all_1.gst-plugins-base gst_all_1.gst-plugins-good
libxml2 nss nspr libxml2 nss nspr
libXScrnSaver python-with-dbus libXScrnSaver python-with-dbus
@ -40,17 +31,16 @@ let unwrapped = stdenv.mkDerivation rec {
libICE libXext libSM cyrus_sasl libICE libXext libSM cyrus_sasl
libgnt ncurses # optional: build finch - the console UI libgnt ncurses # optional: build finch - the console UI
] ]
++ (lib.optional (openssl != null) openssl) ++ lib.optional withOpenssl openssl
++ (lib.optional (gnutls != null) gnutls) ++ lib.optionals withGnutls [ gnutls libgcrypt ]
++ (lib.optional (libgcrypt != null) libgcrypt) ++ lib.optionals stdenv.isLinux [ gtk2 gtkspell2 farstream ]
++ (lib.optionals (stdenv.isLinux) [gtk2 gtkspell2 farstream]) ++ lib.optional stdenv.isDarwin gtk2-x11;
++ (lib.optional (stdenv.isDarwin) gtk2-x11);
propagatedBuildInputs = [ pkg-config gettext ] propagatedBuildInputs = [ pkg-config gettext ]
++ (with perlPackages; [ perl XMLParser ]) ++ (with perlPackages; [ perl XMLParser ])
++ (lib.optional (stdenv.isLinux) gtk2) ++ lib.optional stdenv.isLinux gtk2
++ (lib.optional (stdenv.isDarwin) gtk2-x11); ++ lib.optional stdenv.isDarwin gtk2-x11;
patches = [ ./pidgin-makefile.patch ./add-search-path.patch ]; patches = [ ./pidgin-makefile.patch ./add-search-path.patch ];
@ -66,9 +56,9 @@ let unwrapped = stdenv.mkDerivation rec {
"--disable-tcl" "--disable-tcl"
"--disable-gevolution" "--disable-gevolution"
] ]
++ (lib.optionals (cyrus_sasl != null) [ "--enable-cyrus-sasl=yes" ]) ++ lib.optionals withCyrus_sasl [ "--enable-cyrus-sasl=yes" ]
++ (lib.optionals (gnutls != null) ["--enable-gnutls=yes" "--enable-nss=no"]) ++ lib.optionals withGnutls ["--enable-gnutls=yes" "--enable-nss=no"]
++ (lib.optionals (stdenv.isDarwin) ["--disable-gtkspell" "--disable-vv"]); ++ lib.optionals stdenv.isDarwin ["--disable-gtkspell" "--disable-vv"];
enableParallelBuilding = true; enableParallelBuilding = true;
@ -90,12 +80,12 @@ let unwrapped = stdenv.mkDerivation rec {
''; '';
passthru = { passthru = {
makePluginPath = lib.makeSearchPathOutput "lib" "lib/purple-${majorVersion}"; makePluginPath = lib.makeSearchPathOutput "lib" "lib/purple-${lib.versions.major version}";
}; };
meta = with lib; { meta = with lib; {
description = "Multi-protocol instant messaging client"; description = "Multi-protocol instant messaging client";
homepage = "http://pidgin.im"; homepage = "https://pidgin.im/";
license = licenses.gpl2Plus; license = licenses.gpl2Plus;
platforms = platforms.unix; platforms = platforms.unix;
maintainers = [ maintainers.vcunat ]; maintainers = [ maintainers.vcunat ];

6
pkgs/top-level/all-packages.nix
View file

@ -27308,10 +27308,8 @@ with pkgs;
picoloop = callPackage ../applications/audio/picoloop { }; picoloop = callPackage ../applications/audio/picoloop { };
pidgin = callPackage ../applications/networking/instant-messengers/pidgin { pidgin = callPackage ../applications/networking/instant-messengers/pidgin {
openssl = if config.pidgin.openssl or true then openssl else null; withOpenssl = config.pidgin.openssl or true;
gnutls = if config.pidgin.gnutls or false then gnutls else null; withGnutls = config.pidgin.gnutls or false;
libgcrypt = if config.pidgin.gnutls or false then libgcrypt else null;
startupnotification = libstartup_notification;
plugins = []; plugins = [];
}; };