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

treewide icu61+ fixes

Browse Source 
It's exactly the same issue as in the parent commit.
/cc #60250 (2fe63c8).
This commit is contained in:
Vladimír Čunát 2019-06-05 23:16:23 +02:00
parent 0d29488705
commit 290695dd28
No known key found for this signature in database
GPG Key ID: E747DF1F9575A3AA
3 changed files with 9 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
pkgs/applications/video/aegisub/default.nix
View File

@ -48,6 +48,9 @@ stdenv.mkDerivation rec {
hardeningDisable = [ "bindnow" "relro" ]; hardeningDisable = [ "bindnow" "relro" ];
# compat with icu61+ https://github.com/unicode-org/icu/blob/release-64-2/icu4c/readme.html#L554
CXXFLAGS = [ "-DU_USING_ICU_NAMESPACE=1" ];
# this is fixed upstream though not yet in an officially released version, # this is fixed upstream though not yet in an officially released version,
# should be fine remove on next release (if one ever happens) # should be fine remove on next release (if one ever happens)
NIX_LDFLAGS = [ NIX_LDFLAGS = [

3
pkgs/development/libraries/languagemachines/libfolia.nix
View File

@ -16,6 +16,9 @@ stdenv.mkDerivation {
buildInputs = [ automake autoconf bzip2 libtool autoconf-archive libtar libxml2 icu languageMachines.ticcutils ]; buildInputs = [ automake autoconf bzip2 libtool autoconf-archive libtar libxml2 icu languageMachines.ticcutils ];
preConfigure = "sh bootstrap.sh"; preConfigure = "sh bootstrap.sh";
# compat with icu61+ https://github.com/unicode-org/icu/blob/release-64-2/icu4c/readme.html#L554
CXXFLAGS = [ "-DU_USING_ICU_NAMESPACE=1" ];
meta = with stdenv.lib; { meta = with stdenv.lib; {
description = "A C++ API for FoLiA documents; an XML-based linguistic annotation format."; description = "A C++ API for FoLiA documents; an XML-based linguistic annotation format.";
homepage = https://proycon.github.io/folia/; homepage = https://proycon.github.io/folia/;

3
pkgs/tools/filesystems/darling-dmg/default.nix
View File

@ -20,6 +20,9 @@ stdenv.mkDerivation rec {
buildInputs = [ cmake fuse openssl zlib bzip2 libxml2 icu ]; buildInputs = [ cmake fuse openssl zlib bzip2 libxml2 icu ];
# compat with icu61+ https://github.com/unicode-org/icu/blob/release-64-2/icu4c/readme.html#L554
CXXFLAGS = [ "-DU_USING_ICU_NAMESPACE=1" ];
meta = { meta = {
homepage = http://www.darlinghq.org/; homepage = http://www.darlinghq.org/;
description = "Darling lets you open macOS dmgs on Linux"; description = "Darling lets you open macOS dmgs on Linux";