From d67f501452580497829b445c682bba84b0c0b183 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Kier=C3=A1n=20Meinhardt?= <kmein@posteo.de>
Date: Thu, 3 Jun 2021 09:14:36 +0200
Subject: [PATCH] fix(libcoap): re-enable traadfri

---
 configs/default.nix            |  2 +-
 modules/traadfri.nix           |  4 ++--
 packages/libcoap.nix           | 25 +++++++++++++++++--------
 systems/toum/configuration.nix |  2 +-
 4 files changed, 21 insertions(+), 12 deletions(-)

diff --git a/configs/default.nix b/configs/default.nix
index d099b09..57f59c9 100644
--- a/configs/default.nix
+++ b/configs/default.nix
@@ -241,7 +241,7 @@ in {
     ./theming.nix
     ./tmux.nix
     ./tor.nix
-    # ./traadfri.nix
+    ./traadfri.nix
     ./unclutter.nix
     ./version.nix
     ./vscode.nix
diff --git a/modules/traadfri.nix b/modules/traadfri.nix
index 09c4956..aa21683 100644
--- a/modules/traadfri.nix
+++ b/modules/traadfri.nix
@@ -6,8 +6,8 @@ let
     traadfri-package = pkgs.fetchFromGitHub {
       owner = "kmein";
       repo = "traadfri";
-      rev = "7b30d404ecd2d9ff06c60ed33967448e8c2f42f5";
-      sha256 = "1ff37k86vi7bnng3vna8myfkyqbkg25w6ds7gl94m4hax8wikz26";
+      rev = "6385d5b9e79910b4caee876536176cf9d6a8b9cc";
+      sha256 = "1l0vsxf4f4k9hgqa8sjkq4pgidbhpwps8lr3dvvnwnjh5636pbs9";
     };
   in pkgs.python3Packages.callPackage traadfri-package {
     libcoap = pkgs.callPackage <niveum/packages/libcoap.nix> { tls = true; };
diff --git a/packages/libcoap.nix b/packages/libcoap.nix
index e22c732..d8823ca 100644
--- a/packages/libcoap.nix
+++ b/packages/libcoap.nix
@@ -1,18 +1,27 @@
-{ lib, fetchFromGitHub, automake, autoconf, which, libtool, stdenv, gnutls
-, tls ? false }:
+{ lib, pkg-config, fetchFromGitHub, automake, autoconf, which, libtool, stdenv, gnutls
+, doxygen, asciidoc
+, tls ? false, docs ? true }:
 stdenv.mkDerivation {
   name = "libcoap";
+  version = "unstable-2021-05-28";
   src = fetchFromGitHub {
     repo = "libcoap";
     owner = "obgm";
-    rev = "25863042ae1e95138776f65c772f9fa6ce60495c";
-    sha256 = "1nic584jwkndg0w831h0fnxk0zx0apf2lw5md079m3di7zcxs6bw";
+    rev = "62b2be4da1d0fdf4b7217487ee83dc5920174425";
+    sha256 = "1igjv0hbwmakdccp5in4gw9w2p5swxdwsdx0glyna2s29sh1d37x";
     fetchSubmodules = true;
   };
-  buildInputs = [ automake autoconf which libtool ] ++ lib.optional tls gnutls;
-  preConfigure = "./autogen.sh";
-  configureFlags = [ "--disable-documentation" "--disable-shared" ]
-    ++ lib.optional tls "--enable-dtls";
+  buildInputs = [ which pkg-config automake autoconf libtool ]
+    ++ lib.optionals docs [ doxygen asciidoc ]
+    ++ lib.optional tls gnutls;
+  # preConfigure = "./autogen.sh";
+  # configureFlags = lib.optional (!docs) "--disable-documentation" ++  lib.optional tls "--enable-dtls";
+  configurePhase = ''
+    ./autogen.sh || :
+    ./configure --enable-dtls --prefix=$out
+  '';
+  buildPhase = "make";
+  installPhase = "make install";
   meta = with lib; {
     homepage = "https://github.com/obgm/libcoap";
     description = "A CoAP (RFC 7252) implementation in C";
diff --git a/systems/toum/configuration.nix b/systems/toum/configuration.nix
index 2fa1d76..afb1b2e 100644
--- a/systems/toum/configuration.nix
+++ b/systems/toum/configuration.nix
@@ -13,7 +13,7 @@ in {
     <niveum/configs/wifi.nix>
     <niveum/configs/tmux.nix>
     <niveum/configs/version.nix>
-    # <niveum/configs/traadfri.nix>
+    <niveum/configs/traadfri.nix>
     <niveum/modules/retiolum.nix>
   ];