diff options
| author | Artturin <Artturin@artturin.com> | 2021-09-22 03:33:47 +0300 |
|---|---|---|
| committer | github-actions[bot] <github-actions[bot]@users.noreply.github.com> | 2021-09-22 21:18:57 +0000 |
| commit | 489d05a9b4f8d239199bab1fdc007824465e838e (patch) | |
| tree | d20e66c839c114b7d564186d99b7741d83f81b8e | |
| parent | Merge pull request #137369 from NixOS/backport-134007-to-release-21.05 (diff) | |
| download | nixpkgs-origin/backport-138853-to-release-21.05.tar.gz | |
cups-filters: 1.25.12 -> 1.28.10origin/backport-138853-to-release-21.05
enable tests
enable braille embosser support
(cherry picked from commit a6f470897c8470c83cfb58d9e2943d104d4dca07)
| -rw-r--r-- | pkgs/misc/cups/filters.nix | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/pkgs/misc/cups/filters.nix b/pkgs/misc/cups/filters.nix index 8b1e7fe8fc70..911892cb728e 100644 --- a/pkgs/misc/cups/filters.nix +++ b/pkgs/misc/cups/filters.nix @@ -1,7 +1,7 @@ { lib, stdenv, fetchurl, pkg-config, cups, poppler, poppler_utils, fontconfig , libjpeg, libpng, perl, ijs, qpdf, dbus, avahi , makeWrapper, coreutils, gnused, bc, gawk, gnugrep, which, ghostscript -, mupdf +, mupdf, dejavu_fonts, liblouis }: let @@ -9,11 +9,11 @@ let in stdenv.mkDerivation rec { pname = "cups-filters"; - version = "1.25.12"; + version = "1.28.10"; src = fetchurl { url = "https://openprinting.org/download/cups-filters/${pname}-${version}.tar.xz"; - sha256 = "1kv25011iyzvd33n5zmmn1z2p6pzk26hmmw6qvjjnx8p3sp7raqn"; + sha256 = "sha256-z4yQRpTETPaJtXJORtI9qa5RJdVDdLNAxkIHfMKcqDc="; }; nativeBuildInputs = [ pkg-config makeWrapper ]; @@ -21,6 +21,7 @@ in stdenv.mkDerivation rec { buildInputs = [ cups poppler poppler_utils fontconfig libjpeg libpng perl ijs qpdf dbus avahi ghostscript mupdf + liblouis # braille embosser support ]; configureFlags = [ @@ -33,7 +34,7 @@ in stdenv.mkDerivation rec { "--enable-imagefilters" "--with-rcdir=no" "--with-shell=${stdenv.shell}" - "--with-test-font-path=/path-does-not-exist" + "--with-test-font-path=${dejavu_fonts}/share/fonts/truetype/DejaVuSans.ttf" ]; makeFlags = [ "CUPS_SERVERBIN=$(out)/lib/cups" "CUPS_DATADIR=$(out)/share/cups" "CUPS_SERVERROOT=$(out)/etc/cups" ]; @@ -60,7 +61,7 @@ in stdenv.mkDerivation rec { ''; enableParallelBuilding = true; - doCheck = false; # fails 4 out of 6 tests + doCheck = true; meta = { homepage = "http://www.linuxfoundation.org/collaborate/workgroups/openprinting/cups-filters"; |