@@ -1,5 +1,5 @@
11{ lib, stdenv,
2− fetchzip,
2+ fetchFromGitHub,
33 makeWrapper,
44 cmake,
55 python3,
@@ -17,29 +17,17 @@
1717 cereal
1818}:
1919
20−let
21− version = "2020.2";
22− minizip = "f5282643091dc1b33546bb8d8b3c23d78fdba231";
23−
24− domoticz-src = fetchzip {
25− url = "https://github.com/domoticz/domoticz/archive/${version}.tar.gz";
26− sha256 = "1b4pkw9qp7f5r995vm4xdnpbwi9vxjyzbnk63bmy1xkvbhshm0g3";
27− };
28−
29− minizip-src = fetchzip {
30− url = "https://github.com/domoticz/minizip/archive/${minizip}.tar.gz";
31− sha256 = "1vddrzm4pwl14bms91fs3mbqqjhcxrmpx9a68b6nfbs20xmpnsny";
32− };
33−in
3420stdenv.mkDerivation rec {
3521 pname = "domoticz";
36− inherit version;
22+ version = "2021.1";
3723
38− src = domoticz-src;
39−
40− postUnpack = ''
41− cp -r ${minizip-src}/* $sourceRoot/extern/minizip
42− '';
24+ src = fetchFromGitHub {
25+ owner = "domoticz";
26+ repo = pname;
27+ rev = version;
28+ sha256 = "03s1fx2ilhiq47p99c6iln1fi0rhdcxxsrv1zaww7f7bc744vzbk";
29+ fetchSubmodules = true;
30+ };
4331
4432 buildInputs = [
4533 openssl