From 3d04d470cdd0facb906473a47e8ab04a53351c39 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Tue, 21 Feb 2017 13:30:50 +0100 Subject: [PATCH] cjdns: fix build with glibc-2.25 via upstream patch --- pkgs/tools/networking/cjdns/default.nix | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) 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;