alioth/nixpkgs
3
0
Fork 0
forked from mirrors/nixpkgs
Code Releases Activity

Merge pull request #138853 from Artturin/cups-filters-update

Browse source
This commit is contained in:
Sandro 2021-09-22 23:14:22 +02:00 committed by GitHub
parent fd25863788 a6f470897c
commit 6d47e51361
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 6 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
pkgs/misc/cups/filters.nix
View file

@ -1,7 +1,7 @@
{ lib, stdenv, fetchurl, pkg-config, cups, poppler, poppler_utils, fontconfig { lib, stdenv, fetchurl, pkg-config, cups, poppler, poppler_utils, fontconfig
, libjpeg, libpng, perl, ijs, qpdf, dbus, avahi , libjpeg, libpng, perl, ijs, qpdf, dbus, avahi
, makeWrapper, coreutils, gnused, bc, gawk, gnugrep, which, ghostscript , makeWrapper, coreutils, gnused, bc, gawk, gnugrep, which, ghostscript
, mupdf , mupdf, dejavu_fonts, liblouis
}: }:
let let
@ -9,11 +9,11 @@ let
in stdenv.mkDerivation rec { in stdenv.mkDerivation rec {
pname = "cups-filters"; pname = "cups-filters";
version = "1.25.12"; version = "1.28.10";
src = fetchurl { src = fetchurl {
url = "https://openprinting.org/download/cups-filters/${pname}-${version}.tar.xz"; url = "https://openprinting.org/download/cups-filters/${pname}-${version}.tar.xz";
sha256 = "1kv25011iyzvd33n5zmmn1z2p6pzk26hmmw6qvjjnx8p3sp7raqn"; sha256 = "sha256-z4yQRpTETPaJtXJORtI9qa5RJdVDdLNAxkIHfMKcqDc=";
}; };
nativeBuildInputs = [ pkg-config makeWrapper ]; nativeBuildInputs = [ pkg-config makeWrapper ];
@ -21,6 +21,7 @@ in stdenv.mkDerivation rec {
buildInputs = [ buildInputs = [
cups poppler poppler_utils fontconfig libjpeg libpng perl cups poppler poppler_utils fontconfig libjpeg libpng perl
ijs qpdf dbus avahi ghostscript mupdf ijs qpdf dbus avahi ghostscript mupdf
liblouis # braille embosser support
]; ];
configureFlags = [ configureFlags = [
@ -33,7 +34,7 @@ in stdenv.mkDerivation rec {
"--enable-imagefilters" "--enable-imagefilters"
"--with-rcdir=no" "--with-rcdir=no"
"--with-shell=${stdenv.shell}" "--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" ]; 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; enableParallelBuilding = true;
doCheck = false; # fails 4 out of 6 tests doCheck = true;
meta = { meta = {
homepage = "http://www.linuxfoundation.org/collaborate/workgroups/openprinting/cups-filters"; homepage = "http://www.linuxfoundation.org/collaborate/workgroups/openprinting/cups-filters";