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,12 @@
diff --git a/meson.build b/meson.build
index cb1e0df..d90c85c 100644
--- a/meson.build
+++ b/meson.build
@@ -95,6 +95,6 @@ endif
configure_file(
input: 'gsignond.conf.in',
configuration: conf_data,
- install_dir: sysconf_dir,
+ install_dir: 'etc/',
output: 'gsignond.conf'
)

View file

@ -0,0 +1,67 @@
{ lib, stdenv, fetchFromGitLab, pkg-config, meson, ninja, glib, glib-networking
, sqlite, gobject-introspection, vala, gtk-doc, libsecret, docbook_xsl
, docbook_xml_dtd_43, docbook_xml_dtd_45, glibcLocales, makeWrapper
, symlinkJoin, gsignondPlugins, plugins }:
let
unwrapped = stdenv.mkDerivation rec {
pname = "gsignond";
version = "1.2.0";
outputs = [ "out" "dev" "devdoc" ];
src = fetchFromGitLab {
owner = "accounts-sso";
repo = pname;
rev = version;
sha256 = "17cpil3lpijgyj2z5c41vhb7fpk17038k5ggyw9p6049jrlf423m";
};
nativeBuildInputs = [
docbook_xml_dtd_43
docbook_xml_dtd_45
docbook_xsl
glibcLocales
gobject-introspection
gtk-doc
meson
ninja
pkg-config
vala
];
buildInputs = [
glib
glib-networking
libsecret
];
propagatedBuildInputs = [ sqlite ];
mesonFlags = [
"-Dbus_type=session"
"-Dextension=desktop"
];
LC_ALL = "en_US.UTF-8";
patches = [
./conf.patch
./plugin-load-env.patch
];
meta = with lib; {
description = "D-Bus service which performs user authentication on behalf of its clients";
homepage = "https://gitlab.com/accounts-sso/gsignond";
license = licenses.lgpl21Plus;
maintainers = with maintainers; [ ];
platforms = platforms.linux;
};
};
in if plugins == [] then unwrapped
else import ./wrapper.nix {
inherit makeWrapper symlinkJoin plugins;
gsignond = unwrapped;
}

View file

@ -0,0 +1,35 @@
diff --git a/src/gplugind/gsignond-plugin-loader.c b/src/gplugind/gsignond-plugin-loader.c
index 5497b32..979e1b4 100644
--- a/src/gplugind/gsignond-plugin-loader.c
+++ b/src/gplugind/gsignond-plugin-loader.c
@@ -38,11 +38,10 @@ gsignond_load_plugin (
gchar *plugin_filename;
GSignondPlugin *plugin;
-# ifdef ENABLE_DEBUG
const gchar *env_val = g_getenv("SSO_GPLUGINS_DIR");
if (env_val)
plugin_path = env_val;
-# endif
+
plugin_filename = g_module_build_path (plugin_path, plugin_type);
plugin = gsignond_load_plugin_with_filename (plugin_type,
plugin_filename);
diff --git a/src/gplugind/main.c b/src/gplugind/main.c
index 1c6cdb6..c85c623 100644
--- a/src/gplugind/main.c
+++ b/src/gplugind/main.c
@@ -93,11 +93,11 @@ _install_sighandlers (GMainLoop *main_loop)
static const gchar* _plugin_path(void)
{
const gchar *plugin_path = GSIGNOND_GPLUGINS_DIR;
-# ifdef ENABLE_DEBUG
+
const gchar *env_val = g_getenv("SSO_GPLUGINS_DIR");
if (env_val)
plugin_path = env_val;
-# endif
+
return plugin_path;
}

View file

@ -0,0 +1,38 @@
{ lib, stdenv, fetchFromGitLab, pkg-config, meson, ninja, vala, glib, gsignond, json-glib, libsoup, gobject-introspection }:
stdenv.mkDerivation {
pname = "gsignond-plugin-lastfm";
version = "2018-05-07";
src = fetchFromGitLab {
owner = "accounts-sso";
repo = "gsignond-plugin-lastfm";
rev = "0a7a5f8511282e45cfe35987b81f27f158f0648c";
sha256 = "0ay6ir9zg9l0264x5xwd7c6j8qmwlhrifkkkjd1yrjh9sqxyfj7f";
};
nativeBuildInputs = [
gobject-introspection
meson
ninja
pkg-config
vala
];
buildInputs = [
glib
gsignond
json-glib
libsoup
];
PKG_CONFIG_GSIGNOND_GPLUGINSDIR = "${placeholder "out"}/lib/gsignond/gplugins";
meta = with lib; {
description = "Plugin for the Accounts-SSO gSignOn daemon that handles Last.FM credentials";
homepage = "https://gitlab.com/accounts-sso/gsignond-plugin-lastfm";
license = licenses.lgpl21Plus;
maintainers = with maintainers; [ ];
platforms = platforms.linux;
};
}

View file

@ -0,0 +1,36 @@
{ lib, stdenv, fetchFromGitLab, pkg-config, meson, ninja, vala, glib, gsignond, gobject-introspection }:
stdenv.mkDerivation rec {
pname = "gsignond-plugin-mail";
version = "0.3.0";
src = fetchFromGitLab {
owner = "accounts-sso";
repo = "gsignond-plugin-mail";
rev = version;
sha256 = "0x8jcl0ra9kacm80f1im5wpxp9r9wxayjwnk6dkv7fhjbl2p4nh0";
};
nativeBuildInputs = [
gobject-introspection
meson
ninja
pkg-config
vala
];
buildInputs = [
glib
gsignond
];
PKG_CONFIG_GSIGNOND_GPLUGINSDIR = "${placeholder "out"}/lib/gsignond/gplugins";
meta = with lib; {
description = "Plugin for the Accounts-SSO gSignOn daemon that handles E-Mail credentials";
homepage = "https://gitlab.com/accounts-sso/gsignond-plugin-mail";
license = licenses.lgpl21Plus;
maintainers = with maintainers; [ ];
platforms = platforms.linux;
};
}

View file

@ -0,0 +1,48 @@
{ lib, stdenv, fetchFromGitLab, pkg-config, meson, ninja, glib, gsignond, check
, json-glib, libsoup, gnutls, gtk-doc, docbook_xml_dtd_43, docbook_xml_dtd_45
, docbook_xsl, glibcLocales, gobject-introspection }:
stdenv.mkDerivation {
pname = "gsignond-plugin-oauth";
version = "2018-10-15";
src = fetchFromGitLab {
owner = "accounts-sso";
repo = "gsignond-plugin-oa";
rev = "d471cebfd7c50567b1244277a9559f18f8d58691";
sha256 = "00axl8wwp2arc6h4bpr4m3ik2hy8an0lbm48q2a9r94krmq56hnx";
};
nativeBuildInputs = [
check
docbook_xml_dtd_43
docbook_xml_dtd_45
docbook_xsl
glibcLocales
gobject-introspection
gtk-doc
meson
ninja
pkg-config
];
buildInputs = [
glib
gnutls
gsignond
json-glib
libsoup
];
LC_ALL = "en_US.UTF-8";
PKG_CONFIG_GSIGNOND_GPLUGINSDIR = "${placeholder "out"}/lib/gsignond/gplugins";
meta = with lib; {
description = "Plugin for the Accounts-SSO gSignOn daemon that handles the OAuth 1.0 and 2.0 authentication protocols";
homepage = "https://gitlab.com/accounts-sso/gsignond-plugin-oa";
license = licenses.lgpl21Plus;
maintainers = with maintainers; [ ];
platforms = platforms.linux;
};
}

View file

@ -0,0 +1,45 @@
{ lib, stdenv, fetchFromGitLab, pkg-config, meson, ninja, glib, gsignond, gsasl, check
, gtk-doc, docbook_xml_dtd_43, docbook_xml_dtd_45, docbook_xsl, glibcLocales, gobject-introspection }:
stdenv.mkDerivation {
pname = "gsignond-plugin-sasl";
version = "2018-10-15";
src = fetchFromGitLab {
owner = "accounts-sso";
repo = "gsignond-plugin-sasl";
rev = "b304c70b7dad9368b23b1205122d10de684c896a";
sha256 = "0knzw7c2fm2kzs1gxbrm4kk67522w9cpwqj7xvn86473068k90va";
};
nativeBuildInputs = [
check
docbook_xml_dtd_43
docbook_xml_dtd_45
docbook_xsl
glibcLocales
gobject-introspection
gtk-doc
meson
ninja
pkg-config
];
buildInputs = [
glib
gsasl
gsignond
];
LC_ALL = "en_US.UTF-8";
PKG_CONFIG_GSIGNOND_GPLUGINSDIR = "${placeholder "out"}/lib/gsignond/gplugins";
meta = with lib; {
description = "Plugin for the Accounts-SSO gSignOn daemon that handles the SASL authentication protocol";
homepage = "https://gitlab.com/accounts-sso/gsignond-plugin-sasl";
license = licenses.lgpl21Plus;
maintainers = with maintainers; [ ];
platforms = platforms.linux;
};
}

View file

@ -0,0 +1,25 @@
{ makeWrapper, symlinkJoin, gsignond, plugins }:
symlinkJoin {
name = "gsignond-with-plugins-${gsignond.version}";
paths = [ gsignond ] ++ plugins;
buildInputs = [ makeWrapper ];
postBuild = ''
wrapProgram $out/bin/gsignond \
--set SSO_GPLUGINS_DIR "$out/lib/gsignond/gplugins"
rm $out/share/dbus-1/services/com.google.code.AccountsSSO.gSingleSignOn.service
rm $out/share/dbus-1/services/com.google.code.AccountsSSO.SingleSignOn.service
substitute ${gsignond}/share/dbus-1/services/com.google.code.AccountsSSO.gSingleSignOn.service $out/share/dbus-1/services/com.google.code.AccountsSSO.gSingleSignOn.service \
--replace ${gsignond} $out
substitute ${gsignond}/share/dbus-1/services/com.google.code.AccountsSSO.SingleSignOn.service $out/share/dbus-1/services/com.google.code.AccountsSSO.SingleSignOn.service \
--replace ${gsignond} $out
'';
inherit (gsignond) meta;
}