diff options
| author | Vladimír Čunát <v@cunat.cz> | 2019-08-18 20:58:56 +0200 |
|---|---|---|
| committer | Luka Blaskovic <lblasc@tvbeat.com> | 2020-01-14 08:27:00 +0000 |
| commit | 2aea16c4d6ee1fa4985ad94d04f2046b2e2b6df6 (patch) | |
| tree | ee705428ab467709d238996c9929b3e4912fa8c3 /pkgs/development/libraries/glibc | |
| parent | 0c75f513045cdccadd53d08c8027815b9b5b3e6b (diff) | |
glibc: depend on libidn2 (and libunistring, transitively)
It's a bit hacky, but ATM I can't see any better way for glibc >= 2.28.
Signed-off-by: Luka Blaskovic <lblasc@tvbeat.com>
Diffstat (limited to 'pkgs/development/libraries/glibc')
| -rw-r--r-- | pkgs/development/libraries/glibc/common.nix | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/pkgs/development/libraries/glibc/common.nix b/pkgs/development/libraries/glibc/common.nix index a5a83b645abb..cd3b06f08643 100644 --- a/pkgs/development/libraries/glibc/common.nix +++ b/pkgs/development/libraries/glibc/common.nix @@ -22,6 +22,7 @@ , fetchurl, fetchpatch , linuxHeaders ? null , gd ? null, libpng ? null +, libidn2 , bison , python3 }: @@ -132,6 +133,15 @@ stdenv.mkDerivation ({ # nscd needs libgcc, and we don't want it dynamically linked # because we don't want it to depend on bootstrap-tools libs. echo "LDFLAGS-nscd += -static-libgcc" >> nscd/Makefile + + # Ensure that libidn2 is found. + patch -p 1 <<EOF + --- a/inet/idna.c + +++ b/inet/idna.c + @@ -25,1 +25,1 @@ + -#define LIBIDN2_SONAME "libidn2.so.0" + +#define LIBIDN2_SONAME "${lib.getLib libidn2}/lib/libidn2.so.0" + EOF ''; configureFlags = |