JakeHillion/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

cjdns: updating with bugfix, and readd nodejs tools

Browse Source 
(cherry picked from commit cd80d050cb8145d45c56533625beb82f37177fae)
This commit is contained in:
Lluís Batlle i Rossell 2015-01-30 09:25:21 +01:00
parent 98a69c0dcb
commit adf6ef3865
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
pkgs/tools/networking/cjdns/default.nix
View File

@ -2,7 +2,7 @@
let let
version = "15"; # see ${src}/util/version/Version.h version = "15"; # see ${src}/util/version/Version.h
date = "20150129"; date = "20150130";
in in
stdenv.mkDerivation { stdenv.mkDerivation {
name = "cjdns-${version}-${date}"; name = "cjdns-${version}-${date}";
@ -10,8 +10,8 @@ stdenv.mkDerivation {
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "cjdelisle"; owner = "cjdelisle";
repo = "cjdns"; repo = "cjdns";
rev = "97161a5fef6b98ffbba94888587bd9ce733c2278"; rev = "b7681f601dc0ba84c6c710061089f9898247ba4e";
sha256 = "0wxiwgjcl4rn71b6hjdlfgv9hjy9d43sypikzcl5z65r7xkrb41j"; sha256 = "0r59j9x5i1nkd6k8172l9iq95f6c22ymmkrm9nxwxr5dp2bj0qn5";
}; };
buildInputs = [ which python27 nodejs ] ++ buildInputs = [ which python27 nodejs ] ++
@ -26,7 +26,7 @@ stdenv.mkDerivation {
sed -i 's,/usr/bin/env python,'$(type -P python), \ sed -i 's,/usr/bin/env python,'$(type -P python), \
$(find contrib -type f) $(find contrib -type f)
mkdir -p $out/share/cjdns mkdir -p $out/share/cjdns
cp -R contrib node_build node_modules $out/share/cjdns/ cp -R contrib tools node_build node_modules $out/share/cjdns/
''; '';
meta = with stdenv.lib; { meta = with stdenv.lib; {