Merge pull request #116303 from samuelgrf/printing-related-refactors
This commit is contained in:
commit
5caaae33fb
|
@ -104,7 +104,7 @@ let
|
||||||
ignoreCollisions = true;
|
ignoreCollisions = true;
|
||||||
};
|
};
|
||||||
|
|
||||||
filterGutenprint = pkgs: filter (pkg: pkg.meta.isGutenprint or false == true) pkgs;
|
filterGutenprint = filter (pkg: pkg.meta.isGutenprint or false == true);
|
||||||
containsGutenprint = pkgs: length (filterGutenprint pkgs) > 0;
|
containsGutenprint = pkgs: length (filterGutenprint pkgs) > 0;
|
||||||
getGutenprint = pkgs: head (filterGutenprint pkgs);
|
getGutenprint = pkgs: head (filterGutenprint pkgs);
|
||||||
|
|
||||||
|
|
|
@ -1,4 +1,5 @@
|
||||||
{lib, stdenv, fetchurl, unzip, autoreconfHook, libtool, makeWrapper, cups, ghostscript, pkgsi686Linux, zlib }:
|
{ lib, stdenv, fetchurl, unzip, autoreconfHook, libtool, makeWrapper, cups
|
||||||
|
, ghostscript, pkgsi686Linux, zlib }:
|
||||||
|
|
||||||
let
|
let
|
||||||
|
|
||||||
|
@ -20,7 +21,7 @@ in
|
||||||
|
|
||||||
stdenv.mkDerivation {
|
stdenv.mkDerivation {
|
||||||
pname = "canon-cups-ufr2";
|
pname = "canon-cups-ufr2";
|
||||||
version = version;
|
inherit version;
|
||||||
src = src_canon;
|
src = src_canon;
|
||||||
|
|
||||||
phases = [ "unpackPhase" "installPhase" ];
|
phases = [ "unpackPhase" "installPhase" ];
|
||||||
|
|
|
@ -1,4 +1,6 @@
|
||||||
{lib, stdenv, fetchurl, cups, dpkg, gnused, makeWrapper, ghostscript, file, a2ps, coreutils, gawk, perl, gnugrep, which}:
|
{ lib, stdenv, fetchurl, cups, dpkg, gnused, makeWrapper, ghostscript, file
|
||||||
|
, a2ps, coreutils, perl, gnugrep, which
|
||||||
|
}:
|
||||||
|
|
||||||
let
|
let
|
||||||
version = "3.2.0-1";
|
version = "3.2.0-1";
|
||||||
|
|
Loading…
Reference in a new issue