diff options
| author | Michael Raskin <7c6f434c@mail.ru> | 2010-07-08 13:25:52 +0000 |
|---|---|---|
| committer | Michael Raskin <7c6f434c@mail.ru> | 2010-07-08 13:25:52 +0000 |
| commit | ccc497f80d4bc74f392beca717ea4781a3a60ddd (patch) | |
| tree | ee308e93a0932a4cf46d29ac8d9bbcb68beedb9a /pkgs/development/libraries/cairo | |
| parent | 3c824666fd86301494f2a6db3ebf1b2e1277541a (diff) | |
| download | nixpkgs-ccc497f80d4bc74f392beca717ea4781a3a60ddd.tar nixpkgs-ccc497f80d4bc74f392beca717ea4781a3a60ddd.tar.gz nixpkgs-ccc497f80d4bc74f392beca717ea4781a3a60ddd.tar.bz2 nixpkgs-ccc497f80d4bc74f392beca717ea4781a3a60ddd.tar.lz nixpkgs-ccc497f80d4bc74f392beca717ea4781a3a60ddd.tar.xz nixpkgs-ccc497f80d4bc74f392beca717ea4781a3a60ddd.tar.zst nixpkgs-ccc497f80d4bc74f392beca717ea4781a3a60ddd.zip | |
Make WebKit use libsoup 2.31.2 via deepOverride. Edit a few packages that were overridable but did not allow extra arguments. Remove a catch with deepOverride that pkgs.lib had this attribute in a different sense.
svn path=/nixpkgs/trunk/; revision=22529
Diffstat (limited to 'pkgs/development/libraries/cairo')
| -rw-r--r-- | pkgs/development/libraries/cairo/default.nix | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/pkgs/development/libraries/cairo/default.nix b/pkgs/development/libraries/cairo/default.nix index dc8bb2a9b52..a14b7fdc2da 100644 --- a/pkgs/development/libraries/cairo/default.nix +++ b/pkgs/development/libraries/cairo/default.nix @@ -4,6 +4,7 @@ , xcbSupport ? false , stdenv, fetchurl, pkgconfig, x11, fontconfig, freetype , zlib, libpng, pixman, libxcb ? null, xcbutil ? null +, ... }: assert postscriptSupport -> zlib != null; |