swendel/nixpkgs
1
0
Fork 0
mirror of https://github.com/SebastianWendel/nixpkgs.git synced 2024-09-22 13:29:00 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #60250 from JohnAZoidberg/icu64

Browse source 
icu: 59 -> 64
This commit is contained in:
Silvan Mosberger 2019-05-27 18:31:57 +02:00 committed by GitHub
parent 71bc5e2d64 2fe63c8faf
commit dd12269b78
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 10 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
pkgs/development/libraries/icu/64.nix Normal file
View file

@ -0,0 +1,4 @@
import ./base.nix {
version = "64.2";
sha256 = "0v0xsf14xwlj125y9fd8lrhsaych4d8liv8gr746zng6g225szb2";
}

7
pkgs/top-level/all-packages.nix
View file

@ -10906,8 +10906,13 @@ in
} // (stdenv.lib.optionalAttrs (stdenv.cc.isGNU && stdenv.hostPlatform.isi686) {
stdenv = overrideCC stdenv gcc6; # with gcc-7: undefined reference to `__divmoddi4'
}));
icu64 = callPackage ../development/libraries/icu/64.nix ({
nativeBuildRoot = buildPackages.icu64.override { buildRootOnly = true; };
} // (stdenv.lib.optionalAttrs (stdenv.cc.isGNU && stdenv.hostPlatform.isi686) {
stdenv = overrideCC stdenv gcc6; # with gcc-7: undefined reference to `__divmoddi4'
}));
icu = icu59;
icu = icu64;
id3lib = callPackage ../development/libraries/id3lib { };