@@ -1,4 +1,4 @@
1−{ lib, stdenv, fetchFromGitHub, nodejs, which, python27, util-linux, nixosTests }:
1+{ lib, stdenv, fetchFromGitHub, nodejs, which, python3, util-linux, nixosTests }:
22
33stdenv.mkDerivation rec {
44 pname = "cjdns";
@@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
1111 sha256 = "NOmk+vMZ8i0E2MjrUzksk+tkJ9XVVNEXlE5OOTNa+Y0=";
1212 };
1313
14− buildInputs = [ which python27 nodejs ] ++
14+ buildInputs = [ which python3 nodejs ] ++
1515 # for flock
1616 lib.optional stdenv.isLinux util-linux;
1717
@@ -21,12 +21,8 @@ stdenv.mkDerivation rec {
2121 + "bash do";
2222 installPhase = ''
2323 install -Dt "$out/bin/" cjdroute makekeys privatetopublic publictoip6
24− sed -i 's,/usr/bin/env node,'$(type -P node), \
25− $(find contrib -name "*.js")
26− sed -i 's,/usr/bin/env python,'$(type -P python), \
27− $(find contrib -type f)
2824 mkdir -p $out/share/cjdns
29− cp -R contrib tools node_build node_modules $out/share/cjdns/
25+ cp -R tools node_build node_modules $out/share/cjdns/
3026 '';
3127
3228 passthru.tests.basic = nixosTests.cjdns;