diff options
| author | Will Dietz <w@wdtz.org> | 2018-03-29 22:27:53 -0500 |
|---|---|---|
| committer | Will Dietz <w@wdtz.org> | 2018-03-31 00:24:15 -0500 |
| commit | ddd10e0836ba3f16f3d28cec8da929157154600a (patch) | |
| tree | 63858d68f5b459129c9cbdf18d5f100e529578e9 /nixos/lib | |
| parent | 372b00dfe9846deca733306c11720553d8d43755 (diff) | |
| download | nixlib-ddd10e0836ba3f16f3d28cec8da929157154600a.tar nixlib-ddd10e0836ba3f16f3d28cec8da929157154600a.tar.gz nixlib-ddd10e0836ba3f16f3d28cec8da929157154600a.tar.bz2 nixlib-ddd10e0836ba3f16f3d28cec8da929157154600a.tar.lz nixlib-ddd10e0836ba3f16f3d28cec8da929157154600a.tar.xz nixlib-ddd10e0836ba3f16f3d28cec8da929157154600a.tar.zst nixlib-ddd10e0836ba3f16f3d28cec8da929157154600a.zip | |
nixos testing: significantly reduce deps needed for OCR tests
Instead of imagemagick built with many libraries (notably librsvg which these days requires rust) use imagemagick_light with support for libtiff added.
Diffstat (limited to 'nixos/lib')
| -rw-r--r-- | nixos/lib/testing.nix | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/nixos/lib/testing.nix b/nixos/lib/testing.nix index d990a5f8b6ac..57acc990a48f 100644 --- a/nixos/lib/testing.nix +++ b/nixos/lib/testing.nix @@ -111,6 +111,8 @@ in rec { ocrProg = tesseract_4.override { enableLanguages = [ "eng" ]; }; + imagemagick_tiff = imagemagick_light.override { inherit libtiff; }; + # Generate onvenience wrappers for running the test driver # interactively with the specified network, and for starting the # VMs from the command line. @@ -128,7 +130,7 @@ in rec { wrapProgram $out/bin/nixos-test-driver \ --add-flags "''${vms[*]}" \ ${lib.optionalString enableOCR - "--prefix PATH : '${ocrProg}/bin:${imagemagick}/bin'"} \ + "--prefix PATH : '${ocrProg}/bin:${imagemagick_tiff}/bin'"} \ --run "export testScript=\"\$(cat $out/test-script)\"" \ --set VLANS '${toString vlans}' ln -s ${testDriver}/bin/nixos-test-driver $out/bin/nixos-run-vms |