From ea55d23cd86edf4b7d06673924284880b8a68f15 Mon Sep 17 00:00:00 2001 From: Maximilian Bosch Date: Sun, 23 May 2021 19:08:05 +0200 Subject: diffoscope: fix build ZHF #122042 Failing Hydra build: https://hydra.nixos.org/build/143815905 Currently the diff-check for `.mp3`-files is failing. The only reason for that is that right now is that there are too spaces too much on the last line[1]. [1] https://salsa.debian.org/reproducible-builds/diffoscope/-/blob/175/tests/data/mp3_expected_diff --- pkgs/tools/misc/diffoscope/default.nix | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'pkgs/tools/misc/diffoscope/default.nix') diff --git a/pkgs/tools/misc/diffoscope/default.nix b/pkgs/tools/misc/diffoscope/default.nix index ce0d920ca4a..f59e8bb430a 100644 --- a/pkgs/tools/misc/diffoscope/default.nix +++ b/pkgs/tools/misc/diffoscope/default.nix @@ -35,6 +35,10 @@ python3Packages.buildPythonApplication rec { # When generating manpage, use the installed version substituteInPlace doc/Makefile --replace "../bin" "$out/bin" + + # https://salsa.debian.org/reproducible-builds/diffoscope/-/issues/258 + substituteInPlace tests/data/mp3_expected_diff \ + --replace " Stream" "Stream" ''; nativeBuildInputs = [ docutils help2man installShellFiles ]; -- cgit 1.4.1