mirror of
https://github.com/NixOS/nixpkgs.git
synced 2024-11-17 15:22:59 +01:00
Merge pull request #24908 from adamruzicka/cjdns-v19.1
cjdns: 18 -> 19.1
This commit is contained in:
commit
901a0bb9fa
1 changed files with 2 additions and 8 deletions
|
@ -1,20 +1,14 @@
|
|||
{ stdenv, fetchurl, fetchpatch, nodejs, which, python27, utillinux }:
|
||||
|
||||
let version = "18"; in
|
||||
let version = "19.1"; in
|
||||
stdenv.mkDerivation {
|
||||
name = "cjdns-"+version;
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://github.com/cjdelisle/cjdns/archive/cjdns-v${version}.tar.gz";
|
||||
sha256 = "1as7n730ppn93cpal7s6r6iq1qx46m0c45iwy8baypbpp42zxrap";
|
||||
sha256 = "53c568a500215b055a9894178eb4477bd93a6e1abf751d0bc5ef2a03ea01a188";
|
||||
};
|
||||
|
||||
patches = [(fetchpatch {
|
||||
name = "glibc-2.25.diff";
|
||||
url = https://github.com/cjdelisle/cjdns/pull/1017.diff;
|
||||
sha256 = "1k05d1w04lngcki56b6brkwg9xakzsbr5ibkcba8112v6jdzw51f";
|
||||
})];
|
||||
|
||||
buildInputs = [ which python27 nodejs ] ++
|
||||
# for flock
|
||||
stdenv.lib.optional stdenv.isLinux utillinux;
|
||||
|
|
Loading…
Reference in a new issue