diff options
| author | Tuomas Tynkkynen <tuomas@tuxera.com> | 2017-06-11 17:42:48 +0300 |
|---|---|---|
| committer | Tuomas Tynkkynen <tuomas@tuxera.com> | 2017-06-11 17:44:02 +0300 |
| commit | e19cdd3b34a81f7807a539974dd97bb091648cde (patch) | |
| tree | f0c1514da12c313fb637bf5307cafc7257b8465e /pkgs/development/libraries/icu | |
| parent | 46e2c1398f5ae44717dd00cd5846e54d02980ae0 (diff) | |
| download | nixlib-e19cdd3b34a81f7807a539974dd97bb091648cde.tar nixlib-e19cdd3b34a81f7807a539974dd97bb091648cde.tar.gz nixlib-e19cdd3b34a81f7807a539974dd97bb091648cde.tar.bz2 nixlib-e19cdd3b34a81f7807a539974dd97bb091648cde.tar.lz nixlib-e19cdd3b34a81f7807a539974dd97bb091648cde.tar.xz nixlib-e19cdd3b34a81f7807a539974dd97bb091648cde.tar.zst nixlib-e19cdd3b34a81f7807a539974dd97bb091648cde.zip | |
icu: Fix ARM patch
Broken by fad6fc3dae16b5161895165bf275e329e20860d6. Let's do it in a cleaner way.
Diffstat (limited to 'pkgs/development/libraries/icu')
| -rw-r--r-- | pkgs/development/libraries/icu/0001-Disable-LDFLAGSICUDT-for-Linux.patch | 28 | ||||
| -rw-r--r-- | pkgs/development/libraries/icu/default.nix | 9 |
2 files changed, 5 insertions, 32 deletions
diff --git a/pkgs/development/libraries/icu/0001-Disable-LDFLAGSICUDT-for-Linux.patch b/pkgs/development/libraries/icu/0001-Disable-LDFLAGSICUDT-for-Linux.patch deleted file mode 100644 index 72d3f67d3bcc..000000000000 --- a/pkgs/development/libraries/icu/0001-Disable-LDFLAGSICUDT-for-Linux.patch +++ /dev/null @@ -1,28 +0,0 @@ -From 0c82d6aa02c08e41b13c83b14782bd7024e25d59 Mon Sep 17 00:00:00 2001 -From: Khem Raj <raj.khem@gmail.com> -Date: Sat, 15 Feb 2014 21:06:42 +0000 -Subject: [PATCH] Disable LDFLAGSICUDT for Linux - -Upstream-Status: Inappropriate [ OE Configuration ] - -Signed-off-by: Khem Raj <raj.khem@gmail.com> ---- - source/config/mh-linux | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/source/config/mh-linux b/source/config/mh-linux -index 366f0cc..2689aab 100644 ---- a/source/config/mh-linux -+++ b/source/config/mh-linux -@@ -21,7 +21,7 @@ LD_RPATH= -Wl,-zorigin,-rpath,'$$'ORIGIN - LD_RPATH_PRE = -Wl,-rpath, - - ## These are the library specific LDFLAGS --LDFLAGSICUDT=-nodefaultlibs -nostdlib -+# LDFLAGSICUDT=-nodefaultlibs -nostdlib - - ## Compiler switch to embed a library name - # The initial tab in the next line is to prevent icu-config from reading it. --- -1.7.10.4 - diff --git a/pkgs/development/libraries/icu/default.nix b/pkgs/development/libraries/icu/default.nix index fdf1c6dffe93..173c9bb58ad9 100644 --- a/pkgs/development/libraries/icu/default.nix +++ b/pkgs/development/libraries/icu/default.nix @@ -12,7 +12,7 @@ let sha256 = "0hxhpgydalyxacaaxlmaddc1sjwh65rsnpmg0j414mnblq74vmm8"; }; in -stdenv.mkDerivation ({ +stdenv.mkDerivation { name = pname + "-" + version; src = fetchurl { @@ -39,6 +39,9 @@ stdenv.mkDerivation ({ preConfigure = '' sed -i -e "s|/bin/sh|${stdenv.shell}|" configure + '' + 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 ''; configureFlags = "--disable-debug" + @@ -59,6 +62,4 @@ stdenv.mkDerivation ({ maintainers = with maintainers; [ raskin ]; platforms = platforms.all; }; -} // (if stdenv.isArm then { - patches = [ ./0001-Disable-LDFLAGSICUDT-for-Linux.patch ]; -} else {})) +} |