From b98aa7e40159432daee2315e8dd7fc9c36b59680 Mon Sep 17 00:00:00 2001
From: Michael Raskin <7c6f434c@mail.ru>
Date: Thu, 4 Jun 2009 11:27:41 +0000
Subject: [PATCH] Fixing wrong merge

svn path=/nixpkgs/trunk/; revision=15851
---
 pkgs/top-level/all-packages.nix | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index bdb431009a3c..3469cd86f369 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -3579,9 +3579,6 @@ let
     inherit fetchurl stdenv zlib;
   };
 
-  libproxy = builderDefsPackage (import ../development/libraries/libproxy) {
-  };
-
   libproxy = import ../development/libraries/libproxy {
     inherit stdenv fetchurl;
   };
@@ -4050,7 +4047,7 @@ let
   };
 
   webkit = builderDefsPackage (import ../development/libraries/webkit) {
-    inherit (gnome26) gtk atk pango libsoup gtkdoc;
+    inherit (gnome) gtk atk pango libsoup gtkdoc;
     inherit freetype fontconfig gettext gperf curl
       libjpeg libtiff libpng libxml2 libxslt sqlite
       icu cairo perl intltool automake libtool