summary refs log tree commit diff
path: root/pkgs/tools/networking/cjdns
diff options
context:
space:
mode:
authorVladimír Čunát <vcunat@gmail.com>2017-02-21 13:30:50 +0100
committerVladimír Čunát <vcunat@gmail.com>2017-02-21 13:30:50 +0100
commit3d04d470cdd0facb906473a47e8ab04a53351c39 (patch)
treef4aa876c0ddcf1aa27f29b03112bbc9665b86773 /pkgs/tools/networking/cjdns
parente688bbbee427c8320272e2b81eb710b35ddf7b7e (diff)
downloadnixpkgs-3d04d470cdd0facb906473a47e8ab04a53351c39.tar
nixpkgs-3d04d470cdd0facb906473a47e8ab04a53351c39.tar.gz
nixpkgs-3d04d470cdd0facb906473a47e8ab04a53351c39.tar.bz2
nixpkgs-3d04d470cdd0facb906473a47e8ab04a53351c39.tar.lz
nixpkgs-3d04d470cdd0facb906473a47e8ab04a53351c39.tar.xz
nixpkgs-3d04d470cdd0facb906473a47e8ab04a53351c39.tar.zst
nixpkgs-3d04d470cdd0facb906473a47e8ab04a53351c39.zip
cjdns: fix build with glibc-2.25 via upstream patch
Diffstat (limited to 'pkgs/tools/networking/cjdns')
-rw-r--r--pkgs/tools/networking/cjdns/default.nix8
1 files changed, 7 insertions, 1 deletions
diff --git a/pkgs/tools/networking/cjdns/default.nix b/pkgs/tools/networking/cjdns/default.nix
index 1c91235652a..3000aacafa3 100644
--- a/pkgs/tools/networking/cjdns/default.nix
+++ b/pkgs/tools/networking/cjdns/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, nodejs, which, python27, utillinux }:
+{ stdenv, fetchurl, fetchpatch, nodejs, which, python27, utillinux }:
 
 let version = "18"; in
 stdenv.mkDerivation {
@@ -9,6 +9,12 @@ stdenv.mkDerivation {
     sha256 = "1as7n730ppn93cpal7s6r6iq1qx46m0c45iwy8baypbpp42zxrap";
   };
 
+  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;