public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #43079 from matthewbauer/rework-extra-pkgs

Browse Source 
Rework stage.nix's extraPkgs
This commit is contained in:
Matthew Bauer
2018-07-05 18:05:57 -04:00
committed by GitHub
parent cdebd1c61f ad20a4a1c3
commit bb0febf575
8 changed files with 83 additions and 68 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkgs/misc/cups/drivers/canon/default.nix
+4 -4
View File
@@ -1,10 +1,10 @@
{stdenv, fetchurl, unzip, autoreconfHook, libtool, makeWrapper, cups, ghostscript, callPackage_i686 }:
{stdenv, fetchurl, unzip, autoreconfHook, libtool, makeWrapper, cups, ghostscript, pkgsi686Linux }:
let
i686_NIX_GCC = callPackage_i686 ({gcc}: gcc) {};
i686_libxml2 = callPackage_i686 ({libxml2}: libxml2) {};
i686_glibc = callPackage_i686 ({glibc}: glibc) {};
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";