uboot: (firmwareOdroidC2/C4) don't invoke patch tool, use patches = [] instead

https://github.com/NixOS/nixpkgs/blob/master/pkgs/stdenv/generic/setup.sh#L948
this can do it nicely.

Signed-off-by: Anton Arapov <anton@deadbeef.mx>
This commit is contained in:
Anton Arapov 2021-04-03 12:58:10 +02:00 committed by Alan Daniels
commit 56de2bcd43
30691 changed files with 3076956 additions and 0 deletions

View file

@ -0,0 +1,20 @@
diff --git a/libpurple/plugin.c b/libpurple/plugin.c
index 4f2b402..fda9add 100644
--- a/libpurple/plugin.c
+++ b/libpurple/plugin.c
@@ -1181,8 +1181,15 @@ purple_plugins_get_handle(void) {
void
purple_plugins_init(void) {
void *handle = purple_plugins_get_handle();
+ gchar **paths, **p;
purple_plugins_add_search_path(LIBDIR);
+ paths = g_strsplit(g_getenv("PURPLE_PLUGIN_PATH"), ":", -1);
+ if (paths) {
+ for (p = paths; *p; ++p)
+ if (**p) purple_plugins_add_search_path(*p);
+ }
+ g_strfreev(paths);
purple_signal_register(handle, "plugin-load",
purple_marshal_VOID__POINTER,

View file

@ -0,0 +1,99 @@
{ callPackage, stdenv, fetchurl, makeWrapper, pkg-config, gtk2, gtk2-x11, gtkspell2, aspell
, gst_all_1, libstartup_notification, gettext, perlPackages, libxml2, nss
, nspr, farstream, libXScrnSaver, avahi, dbus, dbus-glib, intltool, libidn
, lib, python3, libICE, libXext, libSM, libgnt, ncurses, cyrus_sasl, openssl
, gnutls, libgcrypt, symlinkJoin, cacert, plugins, withOpenssl, withGnutls, withCyrus_sasl ? true
}:
# FIXME: clean the mess around choosing the SSL library (nss by default)
let unwrapped = stdenv.mkDerivation rec {
pname = "pidgin";
version = "2.14.8";
src = fetchurl {
url = "mirror://sourceforge/pidgin/pidgin-${version}.tar.bz2";
sha256 = "1jjc15pfyw3012q5ffv7q4r88wv07ndqh0wakyxa2k0w4708b01z";
};
nativeBuildInputs = [ makeWrapper ];
NIX_CFLAGS_COMPILE = "-I${gst_all_1.gst-plugins-base.dev}/include/gstreamer-1.0";
buildInputs = let
python-with-dbus = python3.withPackages (pp: with pp; [ dbus-python ]);
in [
aspell libstartup_notification
gst_all_1.gstreamer gst_all_1.gst-plugins-base gst_all_1.gst-plugins-good
libxml2 nss nspr
libXScrnSaver python-with-dbus
avahi dbus dbus-glib intltool libidn
libICE libXext libSM cyrus_sasl
libgnt ncurses # optional: build finch - the console UI
]
++ lib.optional withOpenssl openssl
++ lib.optionals withGnutls [ gnutls libgcrypt ]
++ lib.optionals stdenv.isLinux [ gtk2 gtkspell2 farstream ]
++ lib.optional stdenv.isDarwin gtk2-x11;
propagatedBuildInputs = [ pkg-config gettext ]
++ (with perlPackages; [ perl XMLParser ])
++ lib.optional stdenv.isLinux gtk2
++ lib.optional stdenv.isDarwin gtk2-x11;
patches = [ ./pidgin-makefile.patch ./add-search-path.patch ];
configureFlags = [
"--with-nspr-includes=${nspr.dev}/include/nspr"
"--with-nspr-libs=${nspr.out}/lib"
"--with-nss-includes=${nss.dev}/include/nss"
"--with-nss-libs=${nss.out}/lib"
"--with-ncurses-headers=${ncurses.dev}/include"
"--with-system-ssl-certs=${cacert}/etc/ssl/certs"
"--disable-meanwhile"
"--disable-nm"
"--disable-tcl"
"--disable-gevolution"
]
++ lib.optionals withCyrus_sasl [ "--enable-cyrus-sasl=yes" ]
++ lib.optionals withGnutls ["--enable-gnutls=yes" "--enable-nss=no"]
++ lib.optionals stdenv.isDarwin ["--disable-gtkspell" "--disable-vv"];
enableParallelBuilding = true;
postInstall = ''
wrapProgram $out/bin/pidgin \
--prefix GST_PLUGIN_SYSTEM_PATH_1_0 : "$GST_PLUGIN_SYSTEM_PATH_1_0"
'';
doInstallCheck = stdenv.hostPlatform == stdenv.buildPlatform;
# In particular, this detects missing python imports in some of the tools.
postFixup = let
# TODO: python is a script, so it doesn't work as interpreter on darwin
binsToTest = lib.optionalString stdenv.isLinux "purple-remote," + "pidgin,finch";
in lib.optionalString doInstallCheck ''
for f in "''${!outputBin}"/bin/{${binsToTest}}; do
echo "Testing: $f --help"
"$f" --help
done
'';
passthru = {
makePluginPath = lib.makeSearchPathOutput "lib" "lib/purple-${lib.versions.major version}";
};
meta = with lib; {
description = "Multi-protocol instant messaging client";
homepage = "https://pidgin.im/";
license = licenses.gpl2Plus;
platforms = platforms.unix;
maintainers = [ maintainers.vcunat ];
};
};
in if plugins == [] then unwrapped
else callPackage ./wrapper.nix {
inherit plugins;
pidgin = unwrapped;
}

View file

@ -0,0 +1,64 @@
diff --git a/pidgin/Makefile.am b/pidgin/Makefile.am
index 84d927b..1467c19 100644
--- a/pidgin/Makefile.am
+++ b/pidgin/Makefile.am
@@ -151,6 +151,7 @@ pidgin_LDADD = \
$(GLIB_LIBS) \
$(DBUS_LIBS) \
$(GSTREAMER_LIBS) \
+ $(GSTINTERFACES_LIBS) \
$(GSTVIDEO_LIBS) \
$(XSS_LIBS) \
$(SM_LIBS) \
@@ -171,6 +172,7 @@ AM_CPPFLAGS = \
-I$(top_srcdir) \
$(GLIB_CFLAGS) \
$(GSTREAMER_CFLAGS) \
+ $(GSTINTERFACES_CFLAGS) \
$(DEBUG_CFLAGS) \
$(GTK_CFLAGS) \
$(DBUS_CFLAGS) \
diff --git a/pidgin/Makefile.in b/pidgin/Makefile.in
index 0d51e25..dd5d879 100644
--- a/pidgin/Makefile.in
+++ b/pidgin/Makefile.in
@@ -703,6 +703,7 @@ EXTRA_DIST = \
@ENABLE_GTK_TRUE@ $(GLIB_LIBS) \
@ENABLE_GTK_TRUE@ $(DBUS_LIBS) \
@ENABLE_GTK_TRUE@ $(GSTREAMER_LIBS) \
+@ENABLE_GTK_TRUE@ $(GSTINTERFACES_LIBS) \
@ENABLE_GTK_TRUE@ $(GSTVIDEO_LIBS) \
@ENABLE_GTK_TRUE@ $(XSS_LIBS) \
@ENABLE_GTK_TRUE@ $(SM_LIBS) \
@@ -723,6 +724,7 @@ EXTRA_DIST = \
@ENABLE_GTK_TRUE@ -I$(top_srcdir) \
@ENABLE_GTK_TRUE@ $(GLIB_CFLAGS) \
@ENABLE_GTK_TRUE@ $(GSTREAMER_CFLAGS) \
+@ENABLE_GTK_TRUE@ $(GSTINTERFACES_CFLAGS) \
@ENABLE_GTK_TRUE@ $(DEBUG_CFLAGS) \
@ENABLE_GTK_TRUE@ $(GTK_CFLAGS) \
@ENABLE_GTK_TRUE@ $(DBUS_CFLAGS) \
diff --git a/pidgin/plugins/Makefile.am b/pidgin/plugins/Makefile.am
index 3bb8c22..6d1e869 100644
--- a/pidgin/plugins/Makefile.am
+++ b/pidgin/plugins/Makefile.am
@@ -145,6 +145,7 @@ AM_CPPFLAGS = \
$(GTK_CFLAGS) \
$(UNITY_CFLAGS) \
$(GSTREAMER_CFLAGS) \
+ $(GSTINTERFACES_CFLAGS) \
$(PLUGIN_CFLAGS)
#
diff --git a/pidgin/plugins/Makefile.in b/pidgin/plugins/Makefile.in
index 82a34aa..1f7db00 100644
--- a/pidgin/plugins/Makefile.in
+++ b/pidgin/plugins/Makefile.in
@@ -781,6 +781,7 @@ AM_CPPFLAGS = \
$(GTK_CFLAGS) \
$(UNITY_CFLAGS) \
$(GSTREAMER_CFLAGS) \
+ $(GSTINTERFACES_CFLAGS) \
$(PLUGIN_CFLAGS)

View file

@ -0,0 +1,20 @@
{ lib, symlinkJoin, pidgin, makeWrapper, plugins }:
let
extraArgs = map (x: x.wrapArgs or "") plugins;
in symlinkJoin {
name = "pidgin-with-plugins-${pidgin.version}";
paths = [ pidgin ] ++ plugins;
buildInputs = [ makeWrapper ];
postBuild = ''
wrapProgram $out/bin/pidgin \
--suffix-each PURPLE_PLUGIN_PATH ':' "$out/lib/purple-${lib.versions.major pidgin.version} $out/lib/pidgin" \
${toString extraArgs}
wrapProgram $out/bin/finch \
--suffix-each PURPLE_PLUGIN_PATH ':' "$out/lib/purple-${lib.versions.major pidgin.version}" \
${toString extraArgs}
'';
}