mirror of
https://github.com/ilyakooo0/nixpkgs.git
synced 2024-12-28 14:22:50 +03:00
cjdns: updating with bugfix, and readd nodejs tools
(cherry picked from commit cd80d050cb
)
This commit is contained in:
parent
98a69c0dcb
commit
adf6ef3865
@ -2,7 +2,7 @@
|
||||
|
||||
let
|
||||
version = "15"; # see ${src}/util/version/Version.h
|
||||
date = "20150129";
|
||||
date = "20150130";
|
||||
in
|
||||
stdenv.mkDerivation {
|
||||
name = "cjdns-${version}-${date}";
|
||||
@ -10,8 +10,8 @@ stdenv.mkDerivation {
|
||||
src = fetchFromGitHub {
|
||||
owner = "cjdelisle";
|
||||
repo = "cjdns";
|
||||
rev = "97161a5fef6b98ffbba94888587bd9ce733c2278";
|
||||
sha256 = "0wxiwgjcl4rn71b6hjdlfgv9hjy9d43sypikzcl5z65r7xkrb41j";
|
||||
rev = "b7681f601dc0ba84c6c710061089f9898247ba4e";
|
||||
sha256 = "0r59j9x5i1nkd6k8172l9iq95f6c22ymmkrm9nxwxr5dp2bj0qn5";
|
||||
};
|
||||
|
||||
buildInputs = [ which python27 nodejs ] ++
|
||||
@ -26,7 +26,7 @@ stdenv.mkDerivation {
|
||||
sed -i 's,/usr/bin/env python,'$(type -P python), \
|
||||
$(find contrib -type f)
|
||||
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; {
|
||||
|
Loading…
Reference in New Issue
Block a user