From 5670d96bbc871ebfd20cb2fa3cfa4d72e0c84717 Mon Sep 17 00:00:00 2001 From: Franz Pletz Date: Sun, 26 Feb 2017 21:25:40 +0100 Subject: [PATCH] pythonPackages.libasyncns: fix build with glibc-2.25 --- .../{libasyncns.nix => libasyncns/default.nix} | 2 ++ .../libasyncns/libasyncns-fix-res-consts.patch | 14 ++++++++++++++ pkgs/top-level/python-packages.nix | 2 +- 3 files changed, 17 insertions(+), 1 deletion(-) rename pkgs/development/python-modules/{libasyncns.nix => libasyncns/default.nix} (93%) create mode 100644 pkgs/development/python-modules/libasyncns/libasyncns-fix-res-consts.patch diff --git a/pkgs/development/python-modules/libasyncns.nix b/pkgs/development/python-modules/libasyncns/default.nix similarity index 93% rename from pkgs/development/python-modules/libasyncns.nix rename to pkgs/development/python-modules/libasyncns/default.nix index de0d6ea610d8..63bcad285c4e 100644 --- a/pkgs/development/python-modules/libasyncns.nix +++ b/pkgs/development/python-modules/libasyncns/default.nix @@ -10,6 +10,8 @@ buildPythonPackage rec { sha256 = "1q4l71b2h9q756x4pjynp6kczr2d8c1jvbdp982hf7xzv7w5gxqg"; }; + patches = [ ./libasyncns-fix-res-consts.patch ]; + buildInputs = [ libasyncns ]; nativeBuildInputs = [ pkgconfig ]; doCheck = false; # requires network access diff --git a/pkgs/development/python-modules/libasyncns/libasyncns-fix-res-consts.patch b/pkgs/development/python-modules/libasyncns/libasyncns-fix-res-consts.patch new file mode 100644 index 000000000000..62877300a276 --- /dev/null +++ b/pkgs/development/python-modules/libasyncns/libasyncns-fix-res-consts.patch @@ -0,0 +1,14 @@ +diff --git a/libasyncns.c b/libasyncns.c +index 99a73de..85709b0 100644 +--- a/libasyncns.c ++++ b/libasyncns.c +@@ -134,9 +134,8 @@ PyMODINIT_FUNC initlibasyncns(void) + ADDNSCONST(ns_t_mailb); + ADDNSCONST(ns_t_maila); + ADDNSCONST(ns_t_any); +- ADDNSCONST(ns_t_zxfr); + ADDNSCONST(ns_t_max); + + ADDNSCONST(ns_c_invalid); + ADDNSCONST(ns_c_in); + ADDNSCONST(ns_c_2); diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index b5c8c2c50d21..3944e48607c0 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -28176,7 +28176,7 @@ EOF buildInputs = with self; [ pytest pkgs.glibcLocales ]; }; - libasyncns = callPackage ../development/python-modules/libasyncns.nix { + libasyncns = callPackage ../development/python-modules/libasyncns { inherit (pkgs) libasyncns pkgconfig; };