Merge remote-tracking branch 'prism/master'

2 files changed, 35 insertions, 2 deletions

diff --git a/lass/5pkgs/l-gen-secrets/default.nix b/lass/5pkgs/l-gen-secrets/default.nix
index 85b050644..6cf28c3c2 100644
--- a/lass/5pkgs/l-gen-secrets/default.nix
+++ b/lass/5pkgs/l-gen-secrets/default.nix
@@ -29,7 +29,7 @@ pkgs.writeDashBin "l-gen-secrets" ''
       nets = {
         retiolum = {
           ip4.addr = "10.243.0.changeme";
-          ip6.addr = "42:0:0:0:0:0:0:changeme";
+          ip6.addr = r6 "changeme";
           aliases = [
             "$HOSTNAME.r"
           ];
@@ -38,7 +38,7 @@ pkgs.writeDashBin "l-gen-secrets" ''
           ${"''"};
         };
         wiregrill = {
-          ip6.addr = (wip6 "changeme").address;
+          ip6.addr = w6 "changeme";
           aliases = [
             "$HOSTNAME.w"
           ];
diff --git a/lass/5pkgs/tdlib-purple/default.nix b/lass/5pkgs/tdlib-purple/default.nix
new file mode 100644
index 000000000..445839a4b
--- /dev/null
+++ b/lass/5pkgs/tdlib-purple/default.nix
@@ -0,0 +1,33 @@
+{ stdenv, fetchFromGitHub, cmake, tdlib, pidgin, libwebp, libtgvoip } :
+
+stdenv.mkDerivation rec {
+  pname = "tdlib-purple";
+  version = "0.7.6";
+
+  src = fetchFromGitHub {
+    owner = "ars3niy";
+    repo = pname;
+    rev = "v${version}";
+    sha256 = "1inamfzbrz0sy4y431jgwjfg6lz14a7c71khrg02481raxchhzzf";
+  };
+
+  cmakeFlags = [
+    "-Dtgvoip_INCLUDE_DIRS=${libtgvoip.dev}/include/tgvoip"
+  ];
+
+  nativeBuildInputs = [ cmake ];
+  buildInputs = [ pidgin tdlib libwebp libtgvoip ];
+
+  installPhase = ''
+    mkdir -p $out/lib/purple-2/
+    cp *.so $out/lib/purple-2/
+  '';
+
+  meta = with stdenv.lib; {
+    homepage = "https://github.com/ars3niy/tdlib-purple";
+    description = "New libpurple plugin for Telegram";
+    license = licenses.gpl2;
+    maintainers = [ maintainers.lassulus ];
+    platforms = platforms.linux;
+  };
+}