aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMarius Bakke <mbakke@fastmail.com>2019-07-02 20:21:13 +0200
committerMarius Bakke <mbakke@fastmail.com>2019-07-02 20:21:13 +0200
commitfb82d3472d8bf5c5690d943a82b1bfa93eea58dd (patch)
treecb0fde3b24775f9af4c12f420cbad5807d4bc12d
parent004b4056d490cf91cea5505b1a1c7d14c4215d86 (diff)
downloadguix-fb82d3472d8bf5c5690d943a82b1bfa93eea58dd.tar
guix-fb82d3472d8bf5c5690d943a82b1bfa93eea58dd.tar.gz
gnu: Remove redundant icu4c@64 package.
* gnu/packages/icu4c.scm (icu4c-64): Remove variable. * gnu/packages/chromium.scm (ungoogled-chromium)[inputs]: Change ICU4C-64 to ICU4C.
-rw-r--r--gnu/packages/chromium.scm6
-rw-r--r--gnu/packages/icu4c.scm16
2 files changed, 1 insertions, 21 deletions
diff --git a/gnu/packages/chromium.scm b/gnu/packages/chromium.scm
index 79828ef589..e357556956 100644
--- a/gnu/packages/chromium.scm
+++ b/gnu/packages/chromium.scm
@@ -714,11 +714,7 @@ from forcing GEXP-PROMISE."
("glib" ,glib)
("gtk+" ,gtk+)
("harfbuzz" ,harfbuzz)
-
- ;; Build against ICU 64 to prevent a localization problem in version 75
- ;; and later: <https://github.com/Eloston/ungoogled-chromium/issues/778>.
- ("icu4c" ,icu4c-64)
-
+ ("icu4c" ,icu4c)
("jsoncpp" ,jsoncpp)
("lcms" ,lcms)
("libevent" ,libevent)
diff --git a/gnu/packages/icu4c.scm b/gnu/packages/icu4c.scm
index bc53e7ee3c..ec65aff6cb 100644
--- a/gnu/packages/icu4c.scm
+++ b/gnu/packages/icu4c.scm
@@ -85,22 +85,6 @@ C/C++ part.")
(license x11)
(home-page "http://site.icu-project.org/")))
-(define-public icu4c-64
- (package
- (inherit icu4c)
- (version "64.2")
- (source (origin
- (inherit (package-source icu4c))
- (uri (string-append
- "http://download.icu-project.org/files/icu4c/" version "/icu4c-"
- (string-map (lambda (x) (if (char=? x #\.) #\_ x)) version)
- "-src.tgz"))
- (sha256
- (base32 "0v0xsf14xwlj125y9fd8lrhsaych4d8liv8gr746zng6g225szb2"))))
- (native-inputs
- `(;; For tests.
- ("python" ,python)))))
-
(define-public java-icu4j
(package
(name "java-icu4j")