diff options
| author | Shea Levy <shea@shealevy.com> | 2018-02-24 08:52:58 -0500 |
|---|---|---|
| committer | Shea Levy <shea@shealevy.com> | 2018-02-24 08:52:58 -0500 |
| commit | 80cb13b728a0d3cd8d8a561c3193886d9862ec81 (patch) | |
| tree | 89d40d4ba625124dcfd8f188cfa1036829993060 /pkgs | |
| parent | f51a7ddd11f8a496460056fd5e929af00b5fb6a4 (diff) | |
| download | nixlib-80cb13b728a0d3cd8d8a561c3193886d9862ec81.tar nixlib-80cb13b728a0d3cd8d8a561c3193886d9862ec81.tar.gz nixlib-80cb13b728a0d3cd8d8a561c3193886d9862ec81.tar.bz2 nixlib-80cb13b728a0d3cd8d8a561c3193886d9862ec81.tar.lz nixlib-80cb13b728a0d3cd8d8a561c3193886d9862ec81.tar.xz nixlib-80cb13b728a0d3cd8d8a561c3193886d9862ec81.tar.zst nixlib-80cb13b728a0d3cd8d8a561c3193886d9862ec81.zip | |
icu58: Fix evaluation
Diffstat (limited to 'pkgs')
| -rw-r--r-- | pkgs/development/libraries/icu/58.nix | 4 | ||||
| -rw-r--r-- | pkgs/top-level/all-packages.nix | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/pkgs/development/libraries/icu/58.nix b/pkgs/development/libraries/icu/58.nix index e5b80f4b2700..f7763ba49da1 100644 --- a/pkgs/development/libraries/icu/58.nix +++ b/pkgs/development/libraries/icu/58.nix @@ -1,4 +1,4 @@ -args @ { stdenv, fetchurl, fetchpatch, fixDarwinDylibNames }: +fetchurl: let keywordFix = fetchurl { url = "http://bugs.icu-project.org/trac/changeset/39484?format=diff"; @@ -11,4 +11,4 @@ import ./base.nix { sha256 = "036shcb3f8bm1lynhlsb4kpjm9s9c2vdiir01vg216rs2l8482ib"; patches = [ keywordFix ]; patchFlags = "-p4"; -} args +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index b8b4e46ceb39..82c577d0c4ea 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -9210,7 +9210,7 @@ with pkgs; hyena = callPackage ../development/libraries/hyena { }; - icu58 = callPackage ../development/libraries/icu/58.nix { + icu58 = callPackage (import ../development/libraries/icu/58.nix fetchurl) { nativeBuildRoot = buildPackages.icu58.override { buildRootOnly = true; }; } // (stdenv.lib.optionalAttrs (stdenv.cc.isGNU && stdenv.hostPlatform.isi686) { |