kfm/niveum
1
0
Fork 0
mirror of https://github.com/kmein/niveum synced 2026-03-19 19:41:08 +01:00
Code Releases Activity

fix: traadfri

Browse Source
This commit is contained in:
Kierán Meinhardt
2020-01-22 16:39:49 +01:00
parent 7fc9a76633
commit 09370e800a
3 changed files with 11 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
configs/traadfri.nix
View File

@@ -8,14 +8,11 @@
host = "192.168.178.28"; host = "192.168.178.28";
key = lib.strings.fileContents <shared-secrets/traadfri.key>; key = lib.strings.fileContents <shared-secrets/traadfri.key>;
rooms = { rooms = {
bedroom = 131074; bedroom = 131082;
corridor = 131076; corridor = 131080;
kitchen = 131075; kitchen = 131081;
living-room = 131073; living-room = 131079;
};
bulbs = {
bedread = 65546;
livingread = 65537;
}; };
bulbs.bedside = 65537;
}; };
} }

6
modules/traadfri.nix
View File

@@ -6,11 +6,11 @@ let
let traadfri-package = pkgs.fetchFromGitHub { let traadfri-package = pkgs.fetchFromGitHub {
owner = "kmein"; owner = "kmein";
repo = "traadfri"; repo = "traadfri";
rev = "652741b23213f6491ff3679f969716fdebde9bc3"; rev = "7b30d404ecd2d9ff06c60ed33967448e8c2f42f5";
sha256 = "0rvnc95yww4sc9qkg1pvdcgin3vx381fhx8kwcb6hlg30lpdhhrz"; sha256 = "1ff37k86vi7bnng3vna8myfkyqbkg25w6ds7gl94m4hax8wikz26";
}; };
in pkgs.python3Packages.callPackage traadfri-package { in pkgs.python3Packages.callPackage traadfri-package {
libcoap = pkgs.callPackage <niveum/packages/libcoap.nix> {}; libcoap = pkgs.callPackage <niveum/packages/libcoap.nix> { tls = true; };
}; };
in in
{ {

6
packages/libcoap.nix
View File

@@ -1,4 +1,4 @@
{ fetchFromGitHub, automake, autoconf, which, libtool, stdenv }: { lib, fetchFromGitHub, automake, autoconf, which, libtool, stdenv, gnutls, tls ? false }:
stdenv.mkDerivation { stdenv.mkDerivation {
name = "libcoap"; name = "libcoap";
src = fetchFromGitHub { src = fetchFromGitHub {
@@ -13,12 +13,12 @@ stdenv.mkDerivation {
autoconf autoconf
which which
libtool libtool
]; ] ++ lib.optional tls gnutls;
preConfigure = "./autogen.sh"; preConfigure = "./autogen.sh";
configureFlags = [ configureFlags = [
"--disable-documentation" "--disable-documentation"
"--disable-shared" "--disable-shared"
]; ] ++ lib.optional tls "--enable-dtls";
meta = with stdenv.lib; { meta = with stdenv.lib; {
homepage = "https://github.com/obgm/libcoap"; homepage = "https://github.com/obgm/libcoap";
description = "A CoAP (RFC 7252) implementation in C"; description = "A CoAP (RFC 7252) implementation in C";