diff options
| author | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2012-09-26 14:51:51 -0400 |
|---|---|---|
| committer | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2012-09-26 14:51:51 -0400 |
| commit | d5758c99a315faac7e0631ae4e7bd707095be3c1 (patch) | |
| tree | 9177bc0c57faffe2d7fcbc562f43171f67c337eb /pkgs/development/libraries/webkit | |
| parent | 3aae4ccffa8bdaea0bcc136c39fdc33729e76af3 (diff) | |
| parent | e710915ffc681b06a61ab2257e44c1cd8abbd0ef (diff) | |
| download | nixpkgs-d5758c99a315faac7e0631ae4e7bd707095be3c1.tar nixpkgs-d5758c99a315faac7e0631ae4e7bd707095be3c1.tar.gz nixpkgs-d5758c99a315faac7e0631ae4e7bd707095be3c1.tar.bz2 nixpkgs-d5758c99a315faac7e0631ae4e7bd707095be3c1.tar.lz nixpkgs-d5758c99a315faac7e0631ae4e7bd707095be3c1.tar.xz nixpkgs-d5758c99a315faac7e0631ae4e7bd707095be3c1.tar.zst nixpkgs-d5758c99a315faac7e0631ae4e7bd707095be3c1.zip | |
Merge remote-tracking branch 'origin/master' into x-updates
Conflicts: pkgs/misc/maven/maven-1.0.nix pkgs/os-specific/linux/xf86-input-wacom/default.nix
Diffstat (limited to 'pkgs/development/libraries/webkit')
| -rw-r--r-- | pkgs/development/libraries/webkit/gtk2.nix | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/pkgs/development/libraries/webkit/gtk2.nix b/pkgs/development/libraries/webkit/gtk2.nix index 76a9b90b411..5c755c193a5 100644 --- a/pkgs/development/libraries/webkit/gtk2.nix +++ b/pkgs/development/libraries/webkit/gtk2.nix @@ -13,8 +13,8 @@ rec { buildInputs = [gtk glib atk cairo curl fontconfig freetype gettext libjpeg libpng libtiff libxml2 libxslt pango sqlite icu gperf bison flex autoconf automake libtool - perl intltool pkgconfig libsoup gtkdoc libXt libproxy - enchant python ruby which renderproto libXrender geoclue + intltool pkgconfig libsoup gtkdoc libXt libproxy + enchant python ruby which renderproto libXrender geoclue perl ]; propagatedBuildInputs = [ |