JakeHillion/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge #34204: icu: fix paths returned by icu-config

Browse Source
This commit is contained in:
Vladimír Čunát 2018-01-23 22:45:36 +01:00
commit 9f22de7227
No known key found for this signature in database
GPG Key ID: E747DF1F9575A3AA
1 changed files with 6 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
pkgs/development/libraries/icu/base.nix
View File

@ -34,6 +34,9 @@ stdenv.mkDerivation {
preConfigure = '' preConfigure = ''
sed -i -e "s|/bin/sh|${stdenv.shell}|" configure 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 '' '' + stdenv.lib.optionalString stdenv.isArm ''
# From https://archlinuxarm.org/packages/armv7h/icu/files/icudata-stdlibs.patch # From https://archlinuxarm.org/packages/armv7h/icu/files/icudata-stdlibs.patch
sed -e 's/LDFLAGSICUDT=-nodefaultlibs -nostdlib/LDFLAGSICUDT=/' -i config/mh-linux sed -e 's/LDFLAGSICUDT=-nodefaultlibs -nostdlib/LDFLAGSICUDT=/' -i config/mh-linux
@ -45,6 +48,9 @@ stdenv.mkDerivation {
# remove dependency on bootstrap-tools in early stdenv build # remove dependency on bootstrap-tools in early stdenv build
postInstall = stdenv.lib.optionalString stdenv.isDarwin '' postInstall = stdenv.lib.optionalString stdenv.isDarwin ''
sed -i 's/INSTALL_CMD=.*install/INSTALL_CMD=install/' $out/lib/icu/${version}/pkgdata.inc 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" ''; postFixup = ''moveToOutput lib/icu "$dev" '';