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

fix(libcoap): re-enable traadfri

Browse Source
This commit is contained in:
Kierán Meinhardt
2021-06-03 09:14:36 +02:00
parent 118dcf3046
commit d67f501452
4 changed files with 21 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
configs/default.nix
View File

@@ -241,7 +241,7 @@ in {
./theming.nix ./theming.nix
./tmux.nix ./tmux.nix
./tor.nix ./tor.nix
# ./traadfri.nix ./traadfri.nix
./unclutter.nix ./unclutter.nix
./version.nix ./version.nix
./vscode.nix ./vscode.nix

4
modules/traadfri.nix
View File

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

25
packages/libcoap.nix
View File

@@ -1,18 +1,27 @@
{ lib, fetchFromGitHub, automake, autoconf, which, libtool, stdenv, gnutls { lib, pkg-config, fetchFromGitHub, automake, autoconf, which, libtool, stdenv, gnutls
, tls ? false }: , doxygen, asciidoc
, tls ? false, docs ? true }:
stdenv.mkDerivation { stdenv.mkDerivation {
name = "libcoap"; name = "libcoap";
version = "unstable-2021-05-28";
src = fetchFromGitHub { src = fetchFromGitHub {
repo = "libcoap"; repo = "libcoap";
owner = "obgm"; owner = "obgm";
rev = "25863042ae1e95138776f65c772f9fa6ce60495c"; rev = "62b2be4da1d0fdf4b7217487ee83dc5920174425";
sha256 = "1nic584jwkndg0w831h0fnxk0zx0apf2lw5md079m3di7zcxs6bw"; sha256 = "1igjv0hbwmakdccp5in4gw9w2p5swxdwsdx0glyna2s29sh1d37x";
fetchSubmodules = true; fetchSubmodules = true;
}; };
buildInputs = [ automake autoconf which libtool ] ++ lib.optional tls gnutls; buildInputs = [ which pkg-config automake autoconf libtool ]
preConfigure = "./autogen.sh"; ++ lib.optionals docs [ doxygen asciidoc ]
configureFlags = [ "--disable-documentation" "--disable-shared" ] ++ lib.optional tls gnutls;
++ lib.optional tls "--enable-dtls"; # 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; { meta = with 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";

2
systems/toum/configuration.nix
View File

@@ -13,7 +13,7 @@ in {
<niveum/configs/wifi.nix> <niveum/configs/wifi.nix>
<niveum/configs/tmux.nix> <niveum/configs/tmux.nix>
<niveum/configs/version.nix> <niveum/configs/version.nix>
# <niveum/configs/traadfri.nix> <niveum/configs/traadfri.nix>
<niveum/modules/retiolum.nix> <niveum/modules/retiolum.nix>
]; ];