Unverified Commit 7cef973e authored by Grimmauld's avatar Grimmauld
Browse files

gsignond, gsignondPlugins: remove

parent 4ecb83ed

pkgs/development/libraries/gsignond/conf.patch

deleted100644 → 0
+0 −12
Original line number Diff line number Diff line 
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'

 )

pkgs/development/libraries/gsignond/default.nix

deleted100644 → 0
+0 −93
Original line number Diff line number Diff line 
{

  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";

      mainProgram = "gsignond";

      homepage = "https://gitlab.com/accounts-sso/gsignond";

      license = licenses.lgpl21Plus;

      maintainers = [ ];

      platforms = platforms.linux;

    };

  };



in

if plugins == [ ] then

  unwrapped

else

  import ./wrapper.nix {

    inherit makeWrapper symlinkJoin plugins;

    gsignond = unwrapped;

  }

pkgs/development/libraries/gsignond/plugin-load-env.patch

deleted100644 → 0
+0 −35
Original line number Diff line number Diff line 
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;

 }

pkgs/development/libraries/gsignond/plugins/lastfm.nix

deleted100644 → 0
+0 −51
Original line number Diff line number Diff line 
{

  lib,

  stdenv,

  fetchFromGitLab,

  pkg-config,

  meson,

  ninja,

  vala,

  glib,

  gsignond,

  json-glib,

  libsoup_2_4,

  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_2_4

  ];



  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 = [ ];

    platforms = platforms.linux;

  };

}

pkgs/development/libraries/gsignond/plugins/mail.nix

deleted100644 → 0
+0 −47
Original line number Diff line number Diff line 
{

  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 = [ ];

    platforms = platforms.linux;

  };

}