l: use bitlbee plugin architecture from nixpkgs

5 files changed, 6 insertions, 135 deletions

diff --git a/lass/2configs/bitlbee.nix b/lass/2configs/bitlbee.nix
index fa14c7fe..b23628dc 100644
--- a/lass/2configs/bitlbee.nix
+++ b/lass/2configs/bitlbee.nix
@@ -1,16 +1,12 @@
 { config, pkgs, ... }:
 
-let
-  lpkgs = import ../5pkgs { inherit pkgs; };
-in {
-
-  imports = [
-    ../3modules/bitlbee.nix
-  ];
-
-  lass.bitlbee = {
+{
+  services.bitlbee = {
     enable = true;
-    bitlbeePkg = lpkgs.bitlbee;
     portNumber = 6666;
+    plugins = [
+      pkgs.bitlbee-facebook
+      pkgs.bitlbee-steam
+    ];
   };
 }
diff --git a/lass/5pkgs/bitlbee-dev.nix b/lass/5pkgs/bitlbee-dev.nix
deleted file mode 100644
index dd129591..00000000
--- a/lass/5pkgs/bitlbee-dev.nix
+++ /dev/null
@@ -1,20 +0,0 @@
-{ fetchurl, stdenv, gnutls, glib, pkgconfig, check, libotr, python }:
-
-stdenv.mkDerivation rec {
-  name = "bitlbee-3.4.1";
-
-  src = fetchurl {
-    url = "mirror://bitlbee/src/${name}.tar.gz";
-    sha256 = "1qf0ypa9ba5jvsnpg9slmaran16hcc5fnfzbb1sdch1hjhchn2jh";
-  };
-
-  buildInputs = [ gnutls glib pkgconfig libotr python ];
-
-  buildPhase = "";
-
-  installPhase = ''
-    make install-dev
-  '';
-
-}
-
diff --git a/lass/5pkgs/bitlbee-steam.nix b/lass/5pkgs/bitlbee-steam.nix
deleted file mode 100644
index d869eaac..00000000
--- a/lass/5pkgs/bitlbee-steam.nix
+++ /dev/null
@@ -1,31 +0,0 @@
-{ stdenv, fetchgit, autoconf, automake, bitlbee-dev, glib, libgcrypt, libtool, pkgconfig }:
-
-stdenv.mkDerivation rec {
-  name = "bitlbee-steam-1.3.1";
-
-  src = fetchgit {
-    url = "https://github.com/jgeboski/bitlbee-steam";
-    rev = "439d777c7e8d06712ffc15c3e51d61799f4c0d0c";
-    sha256 = "493924da1083a3b23073c595a9e1989a7ae09a196524ad66ca99c4d8ccc20d2a";
-  };
-
-  buildInputs = [
-    autoconf
-    automake
-    bitlbee-dev
-    glib
-    libgcrypt
-    libtool
-    pkgconfig
-  ];
-
-  configurePhase = ''
-    ./autogen.sh
-  '';
-
-  installPhase = ''
-    mkdir -p $out
-    cp steam/.libs/steam.la $out/
-    cp steam/.libs/steam.so $out/
-  '';
-}
diff --git a/lass/5pkgs/bitlbee.nix b/lass/5pkgs/bitlbee.nix
deleted file mode 100644
index 2a5a8d86..00000000
--- a/lass/5pkgs/bitlbee.nix
+++ /dev/null
@@ -1,71 +0,0 @@
-{ fetchurl, stdenv, gnutls, glib, pkgconfig, check, libotr, python
-  , bitlbee-facebook ? null
-  , bitlbee-steam ? null
-}:
-
-with stdenv.lib;
-stdenv.mkDerivation rec {
-  name = "bitlbee-3.4.1";
-
-  src = fetchurl {
-    url = "mirror://bitlbee/src/${name}.tar.gz";
-    sha256 = "1qf0ypa9ba5jvsnpg9slmaran16hcc5fnfzbb1sdch1hjhchn2jh";
-  };
-
-
-  buildInputs = [ gnutls glib pkgconfig libotr python ]
-    ++ optional doCheck check;
-
-  configureFlags = [
-    "--gcov=1"
-    "--otr=1"
-    "--ssl=gnutls"
-  ];
-
-  postBuild = ''
-    ${if (bitlbee-steam != null) then
-      ''
-        mkdir -p $out/lib/bitlbee/
-        find ${bitlbee-steam}
-        cp ${bitlbee-steam}/* $out/lib/bitlbee/
-      ''
-    else
-      ""
-    }
-  '';
-    #${concatMapStringsSep "\n" ([] ++
-    #  (if (bitlbee-facebook != null) then
-    #    "cp ${bitlbee-faceook}/* $out/"
-    #  else
-    #    ""
-    #  ) ++
-    #  (if (bitlbee-steam != null) then
-    #    "cp ${bitlbee-steam}/* $out/"
-    #  else
-    #    ""
-    #  )
-    #)}
-
-  doCheck = true;
-
-  meta = {
-    description = "IRC instant messaging gateway";
-
-    longDescription = ''
-      BitlBee brings IM (instant messaging) to IRC clients.  It's a
-      great solution for people who have an IRC client running all the
-      time and don't want to run an additional MSN/AIM/whatever
-      client.
-
-      BitlBee currently supports the following IM networks/protocols:
-      XMPP/Jabber (including Google Talk), MSN Messenger, Yahoo!
-      Messenger, AIM and ICQ.
-    '';
-
-    homepage = http://www.bitlbee.org/;
-    license = licenses.gpl2Plus;
-
-    maintainers = with maintainers; [ wkennington pSub ];
-    platforms = platforms.gnu;  # arbitrary choice
-  };
-}
diff --git a/lass/5pkgs/default.nix b/lass/5pkgs/default.nix
index b3857ce9..2b958291 100644
--- a/lass/5pkgs/default.nix
+++ b/lass/5pkgs/default.nix
@@ -5,9 +5,6 @@ let
 in
 
 rec {
-  #bitlbee-dev = callPackage ./bitlbee-dev.nix {};
-  #bitlbee-steam = callPackage ./bitlbee-steam.nix { inherit bitlbee-dev; };
-  #bitlbee = callPackage ./bitlbee.nix { inherit bitlbee-steam; };
   firefoxPlugins = {
     noscript = callPackage ./firefoxPlugins/noscript.nix {};
     ublock = callPackage ./firefoxPlugins/ublock.nix {};