diff options
| author | Vladimír Čunát <v@cunat.cz> | 2019-09-04 11:00:56 +0200 |
|---|---|---|
| committer | Vladimír Čunát <v@cunat.cz> | 2019-09-04 11:00:56 +0200 |
| commit | 4aad2947f8d680f18e5b01e115cf8cff22186998 (patch) | |
| tree | a7a3d020efc6ec7be822bc06e08eca3ac311c9e2 /pkgs/tools/typesetting | |
| parent | 2c5835b09a1d4966756212902d36b1b8ab242da6 (diff) | |
| parent | 1d8a3973f46a2d1360f855eaa0f3a19859771793 (diff) | |
| download | nixpkgs-4aad2947f8d680f18e5b01e115cf8cff22186998.tar nixpkgs-4aad2947f8d680f18e5b01e115cf8cff22186998.tar.gz nixpkgs-4aad2947f8d680f18e5b01e115cf8cff22186998.tar.bz2 nixpkgs-4aad2947f8d680f18e5b01e115cf8cff22186998.tar.lz nixpkgs-4aad2947f8d680f18e5b01e115cf8cff22186998.tar.xz nixpkgs-4aad2947f8d680f18e5b01e115cf8cff22186998.tar.zst nixpkgs-4aad2947f8d680f18e5b01e115cf8cff22186998.zip | |
Merge branch 'master' into staging-next
Diffstat (limited to 'pkgs/tools/typesetting')
| -rw-r--r-- | pkgs/tools/typesetting/biber/default.nix | 16 |
1 files changed, 15 insertions, 1 deletions
diff --git a/pkgs/tools/typesetting/biber/default.nix b/pkgs/tools/typesetting/biber/default.nix index 6d26129f2c1..55349641ab6 100644 --- a/pkgs/tools/typesetting/biber/default.nix +++ b/pkgs/tools/typesetting/biber/default.nix @@ -1,4 +1,4 @@ -{ stdenv, perlPackages, shortenPerlShebang, texlive }: +{ stdenv, fetchpatch, perlPackages, shortenPerlShebang, texlive }: let biberSource = stdenv.lib.head (builtins.filter (p: p.tlType == "source") texlive.biber.pkgs); @@ -10,6 +10,20 @@ perlPackages.buildPerlModule { src = "${biberSource}/source/bibtex/biber/biblatex-biber.tar.gz"; + patches = stdenv.lib.optionals (stdenv.lib.versionAtLeast perlPackages.perl.version "5.30") [ + (fetchpatch { + name = "biber-fix-tests.patch"; + url = "https://git.archlinux.org/svntogit/community.git/plain/trunk/biber-fix-tests.patch?h=5d0fffd493550e28b2fb81ad114d62a7c9403812"; + sha256 = "1ninf46bxf4hm0p5arqbxqyv8r98xdwab34vvp467q1v23kfbhya"; + }) + + (fetchpatch { + name = "biber-fix-tests-2.patch"; + url = "https://git.archlinux.org/svntogit/community.git/plain/trunk/biber-fix-tests-2.patch?h=5d0fffd493550e28b2fb81ad114d62a7c9403812"; + sha256 = "1l8pk454kkm0szxrv9rv9m2a0llw1jm7ffhgpyg4zfiw246n62x0"; + }) + ]; + buildInputs = with perlPackages; [ autovivification BusinessISBN BusinessISMN BusinessISSN ConfigAutoConf DataCompare DataDump DateSimple EncodeEUCJPASCII EncodeHanExtra EncodeJIS2K |