diff options
| author | Frederik Rietdijk <fridh@fridh.nl> | 2018-07-21 19:43:53 +0200 |
|---|---|---|
| committer | Frederik Rietdijk <fridh@fridh.nl> | 2018-07-21 19:43:53 +0200 |
| commit | ad47d658d1734353df834a05e45b98dae968550d (patch) | |
| tree | 5ee2481126f5e29cf961e3b955b748609bc08f82 /pkgs/misc/cups/drivers/canon | |
| parent | 8213ff161c461655aaff7d43984384dbca64b312 (diff) | |
| parent | cc218fc91530529b84307faf6fa2dd8c5d395d6f (diff) | |
| download | nixlib-ad47d658d1734353df834a05e45b98dae968550d.tar nixlib-ad47d658d1734353df834a05e45b98dae968550d.tar.gz nixlib-ad47d658d1734353df834a05e45b98dae968550d.tar.bz2 nixlib-ad47d658d1734353df834a05e45b98dae968550d.tar.lz nixlib-ad47d658d1734353df834a05e45b98dae968550d.tar.xz nixlib-ad47d658d1734353df834a05e45b98dae968550d.tar.zst nixlib-ad47d658d1734353df834a05e45b98dae968550d.zip | |
Merge master into staging-next
Diffstat (limited to 'pkgs/misc/cups/drivers/canon')
| -rw-r--r-- | pkgs/misc/cups/drivers/canon/default.nix | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/pkgs/misc/cups/drivers/canon/default.nix b/pkgs/misc/cups/drivers/canon/default.nix index 1c0b8e13ab0b..9c5ef1d02836 100644 --- a/pkgs/misc/cups/drivers/canon/default.nix +++ b/pkgs/misc/cups/drivers/canon/default.nix @@ -4,7 +4,6 @@ let i686_NIX_GCC = pkgsi686Linux.callPackage ({gcc}: gcc) {}; i686_libxml2 = pkgsi686Linux.callPackage ({libxml2}: libxml2) {}; - i686_glibc = pkgsi686Linux.callPackage ({glibc}: glibc) {}; src_canon = fetchurl { url = "https://files.canon-europe.com/files/soft45378/software/o147jen_linuxufrII_0290.zip"; |