From 8cdf8f15e661cb5dd1fae38cb24b181b2de61e18 Mon Sep 17 00:00:00 2001 From: Andrey Golovizin Date: Tue, 23 Jan 2018 20:41:26 +0100 Subject: [PATCH 1/2] icu: fix include path returned by icu-config --- pkgs/development/libraries/icu/base.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pkgs/development/libraries/icu/base.nix b/pkgs/development/libraries/icu/base.nix index 8a7cf8365a5b..1379a9a373d0 100644 --- a/pkgs/development/libraries/icu/base.nix +++ b/pkgs/development/libraries/icu/base.nix @@ -34,6 +34,9 @@ stdenv.mkDerivation { preConfigure = '' sed -i -e "s|/bin/sh|${stdenv.shell}|" configure + + # $(includedir) is different from $(prefix)/include due to multiple outputs + sed -i -e 's|^\(CPPFLAGS = .*\) -I\$(prefix)/include|\1 -I$(includedir)|' config/Makefile.inc.in '' + stdenv.lib.optionalString stdenv.isArm '' # From https://archlinuxarm.org/packages/armv7h/icu/files/icudata-stdlibs.patch sed -e 's/LDFLAGSICUDT=-nodefaultlibs -nostdlib/LDFLAGSICUDT=/' -i config/mh-linux From e12d9adfe3e72e731230d3926cb46286840a9f7a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Tue, 23 Jan 2018 22:42:57 +0100 Subject: [PATCH 2/2] icu: fix the output of icu-config --incfile --- pkgs/development/libraries/icu/base.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pkgs/development/libraries/icu/base.nix b/pkgs/development/libraries/icu/base.nix index 1379a9a373d0..6d9a9725cc2e 100644 --- a/pkgs/development/libraries/icu/base.nix +++ b/pkgs/development/libraries/icu/base.nix @@ -48,6 +48,9 @@ stdenv.mkDerivation { # remove dependency on bootstrap-tools in early stdenv build postInstall = stdenv.lib.optionalString stdenv.isDarwin '' sed -i 's/INSTALL_CMD=.*install/INSTALL_CMD=install/' $out/lib/icu/${version}/pkgdata.inc + '' + '' + substituteInPlace "$dev/bin/icu-config" \ + --replace \''${pkglibdir}/Makefile.inc "$dev/lib/icu/Makefile.inc" ''; postFixup = ''moveToOutput lib/icu "$dev" '';