pyrox.dev
toxvpn: update versions and allow systemd to be optional
+8
-8
pkgs/tools/networking/toxvpn/default.nix
+8
-8
pkgs/tools/networking/toxvpn/default.nix
···
4
5
let
6
libtoxcoreLocked = stdenv.lib.overrideDerivation libtoxcore (oldAttrs: {
7
-
name = "libtoxcore-20151110";
8
src = fetchFromGitHub {
9
owner = "irungentoo";
10
repo = "toxcore";
11
-
rev = "22634a4b93dda5b17cb357cd84ac46fcfdc22519";
12
-
sha256 = "01i92wm5lg2p7k71qn23sfh01xi8acdrwn23rk52n54h424l1fgy";
13
};
14
});
15
16
in stdenv.mkDerivation {
17
-
name = "toxvpn-20151111";
18
19
src = fetchFromGitHub {
20
owner = "cleverca22";
21
repo = "toxvpn";
22
-
rev = "1d06bb7da277d46abb8595cf152210c4ccf0ba7d";
23
-
sha256 = "1himrbdgsbkfha1d87ysj2hwyz4a6z9yxqbai286imkya84q7r15";
24
};
25
26
-
buildInputs = [ cmake libtoxcoreLocked jsoncpp libsodium systemd libcap ];
27
28
-
cmakeFlags = [ "-DSYSTEMD=1" ];
29
30
meta = with stdenv.lib; {
31
description = "A powerful tool that allows one to make tunneled point to point connections over Tox";
···
4
5
let
6
libtoxcoreLocked = stdenv.lib.overrideDerivation libtoxcore (oldAttrs: {
7
+
name = "libtoxcore-20160319";
8
src = fetchFromGitHub {
9
owner = "irungentoo";
10
repo = "toxcore";
11
+
rev = "532629d486e3361c7d8d95b38293cc7d61dc4ee5";
12
+
sha256 = "0x8mjrjiafgia9vy7w4zhfzicr2fljx8xgm2ppi4kva2r2z1wm2f";
13
};
14
});
15
16
in stdenv.mkDerivation {
17
+
name = "toxvpn-20160606";
18
19
src = fetchFromGitHub {
20
owner = "cleverca22";
21
repo = "toxvpn";
22
+
rev = "50a0a439a6b11579bab7cc0744a18a9addc5eb5c";
23
+
sha256 = "12dkvsqs4fljwa1367jzqaynf6i8c98y9fs2lm2mqp3wkw0r3rg9";
24
};
25
26
+
buildInputs = [ cmake libtoxcoreLocked jsoncpp libsodium libcap ] ++ optional (systemd != null) systemd;
27
28
+
cmakeFlags = optional (systemd != null) [ "-DSYSTEMD=1" ];
29
30
meta = with stdenv.lib; {
31
description = "A powerful tool that allows one to make tunneled point to point connections over Tox";