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

Merge pull request #20955 from savannidgerinel/bugfix-icu-version

Browse Source 
icu4c: fix #20954: icu_54_1 package does not compile
This commit is contained in:
Joachim F 2016-12-07 01:25:06 +01:00 committed by GitHub
commit bf574f33cb
3 changed files with 2 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
pkgs/applications/networking/instant-messengers/zoom-us/default.nix
View File

@ -4,7 +4,7 @@
, glib
, gst_plugins_base
, gstreamer
, icu_54_1
, icu
, libpulseaudio
, libuuid
, libxml2
@ -41,7 +41,7 @@ stdenv.mkDerivation rec {
glib
gst_plugins_base
gstreamer
icu_54_1
icu
libpulseaudio
libuuid
libxml2

11
pkgs/development/libraries/icu/54.1.nix
View File

@ -1,11 +0,0 @@
{ stdenv, fetchurl, fetchpatch, fixDarwinDylibNames }:
let
icu = import ./default.nix { inherit stdenv fetchurl fetchpatch fixDarwinDylibNames; };
in
stdenv.lib.overrideDerivation icu (attrs: {
src = fetchurl {
url = "http://download.icu-project.org/files/icu4c/54.1/icu4c-54_1-src.tgz";
sha256 = "1cwapgjmvrcv1n2wjspj3vahidg596gjfp4jn1gcb4baralcjayl";
};
})

1
pkgs/top-level/all-packages.nix
View File

@ -7473,7 +7473,6 @@ in
hyena = callPackage ../development/libraries/hyena { };
icu = callPackage ../development/libraries/icu { };
icu_54_1 = callPackage ../development/libraries/icu/54.1.nix { };
id3lib = callPackage ../development/libraries/id3lib { };