diff options
| author | Andrey Golovizin <ag@sologoc.com> | 2018-01-23 20:41:26 +0100 |
|---|---|---|
| committer | Andrey Golovizin <ag@sologoc.com> | 2018-01-23 20:58:55 +0100 |
| commit | 8cdf8f15e661cb5dd1fae38cb24b181b2de61e18 (patch) | |
| tree | d39831736837eef166196ffd5acf7187a8832693 /pkgs/development/libraries/icu | |
| parent | 846b5c42f19fe2ea8deb58f072d5c2df56605d19 (diff) | |
| download | nixpkgs-8cdf8f15e661cb5dd1fae38cb24b181b2de61e18.tar nixpkgs-8cdf8f15e661cb5dd1fae38cb24b181b2de61e18.tar.gz nixpkgs-8cdf8f15e661cb5dd1fae38cb24b181b2de61e18.tar.bz2 nixpkgs-8cdf8f15e661cb5dd1fae38cb24b181b2de61e18.tar.lz nixpkgs-8cdf8f15e661cb5dd1fae38cb24b181b2de61e18.tar.xz nixpkgs-8cdf8f15e661cb5dd1fae38cb24b181b2de61e18.tar.zst nixpkgs-8cdf8f15e661cb5dd1fae38cb24b181b2de61e18.zip | |
icu: fix include path returned by icu-config
Diffstat (limited to 'pkgs/development/libraries/icu')
| -rw-r--r-- | pkgs/development/libraries/icu/base.nix | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/pkgs/development/libraries/icu/base.nix b/pkgs/development/libraries/icu/base.nix index 8a7cf8365a5..1379a9a373d 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 |