From f105c2353b78f9fbad960d1bde4456b72631e39d Mon Sep 17 00:00:00 2001
From: "Yury G. Kudryashov" <urkud.urkud@gmail.com>
Date: Wed, 14 Mar 2012 19:35:55 +0000
Subject: [PATCH] Pass libgnome_keyring, not gnome_keyring

svn path=/nixpkgs/trunk/; revision=33082
---
 pkgs/applications/graphics/darktable/default.nix        | 4 ++--
 pkgs/applications/misc/evince/default.nix               | 4 ++--
 pkgs/applications/misc/mysql-workbench/default.nix      | 4 ++--
 pkgs/applications/networking/p2p/retroshare/default.nix | 4 ++--
 pkgs/top-level/all-packages.nix                         | 6 ++----
 5 files changed, 10 insertions(+), 12 deletions(-)

diff --git a/pkgs/applications/graphics/darktable/default.nix b/pkgs/applications/graphics/darktable/default.nix
index c47ed07a48d3..d6e1a6c11195 100644
--- a/pkgs/applications/graphics/darktable/default.nix
+++ b/pkgs/applications/graphics/darktable/default.nix
@@ -1,6 +1,6 @@
 { stdenv, fetchurl
 , GConf, atk, cairo, cmake, curl, dbus_glib, exiv2, glib
-, gnome_keyring, gphoto2, gtk, ilmbase, intltool, lcms, lcms2
+, libgnome_keyring, gphoto2, gtk, ilmbase, intltool, lcms, lcms2
 , lensfun, libXau, libXdmcp, libexif, libglade, libgphoto2, libjpeg
 , libpng, libpthreadstubs, libraw1394, librsvg, libtiff, libxcb
 , openexr, pixman, pkgconfig, sqlite }:
@@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
   };
 
   buildInputs =
-    [ GConf atk cairo cmake curl dbus_glib exiv2 glib gnome_keyring gtk
+    [ GConf atk cairo cmake curl dbus_glib exiv2 glib libgnome_keyring gtk
       ilmbase intltool lcms lcms2 lensfun libXau libXdmcp libexif
       libglade libgphoto2 libjpeg libpng libpthreadstubs libraw1394
       librsvg libtiff libxcb openexr pixman pkgconfig sqlite
diff --git a/pkgs/applications/misc/evince/default.nix b/pkgs/applications/misc/evince/default.nix
index ac81a09c96d8..793c7bda2994 100644
--- a/pkgs/applications/misc/evince/default.nix
+++ b/pkgs/applications/misc/evince/default.nix
@@ -1,7 +1,7 @@
 { fetchurl, stdenv, perl, perlXMLParser, gettext, intltool
 , pkgconfig, glib, gtk, gnomedocutils, gnomeicontheme
 , libgnome, libgnomeui, scrollkeeper, libxslt
-, libglade, gnome_keyring, dbus, dbus_glib
+, libglade, libgnome_keyring, dbus, dbus_glib
 , poppler, libspectre, djvulibre, shared_mime_info
 , makeWrapper, which, ghostscript
 , recentListSize ? null # 5 is not enough, allow passing a different number
@@ -18,7 +18,7 @@ stdenv.mkDerivation rec {
   buildInputs = [
     perl perlXMLParser gettext intltool pkgconfig glib gtk
     gnomedocutils gnomeicontheme libgnome libgnomeui libglade
-    scrollkeeper gnome_keyring
+    scrollkeeper libgnome_keyring
     libxslt  # for `xsltproc'
     dbus dbus_glib poppler libspectre djvulibre makeWrapper which
     ghostscript
diff --git a/pkgs/applications/misc/mysql-workbench/default.nix b/pkgs/applications/misc/mysql-workbench/default.nix
index adf2810f9374..6756b9dacc49 100644
--- a/pkgs/applications/misc/mysql-workbench/default.nix
+++ b/pkgs/applications/misc/mysql-workbench/default.nix
@@ -1,5 +1,5 @@
 { stdenv, fetchurl, makeWrapper, boost, file, gettext
-, glib, glibc, gnome_keyring, gtk, gtkmm, intltool, libctemplate, libglade
+, glib, glibc, libgnome_keyring, gtk, gtkmm, intltool, libctemplate, libglade
 , libgnome, libsigcxx, libtool, libuuid, libxml2, libzip, lua, mesa, mysql
 , pango, paramiko, pcre, pexpect, pkgconfig, pycrypto, python, sqlite
 }:
@@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
     sha256 = "1b5ijaccy2k7if4pld8ihz1wa1wr1f9gj2m5xa4kf7v05zcx93c6";
   };
 
-  buildInputs = [ boost file gettext glib glibc gnome_keyring gtk gtkmm intltool
+  buildInputs = [ boost file gettext glib glibc libgnome_keyring gtk gtkmm intltool
     libctemplate libglade libgnome libsigcxx libtool libuuid libxml2 libzip lua makeWrapper mesa
     mysql paramiko pcre pexpect pkgconfig pycrypto python sqlite ];
 
diff --git a/pkgs/applications/networking/p2p/retroshare/default.nix b/pkgs/applications/networking/p2p/retroshare/default.nix
index be9847bc51cb..d4e3aa91cc0b 100644
--- a/pkgs/applications/networking/p2p/retroshare/default.nix
+++ b/pkgs/applications/networking/p2p/retroshare/default.nix
@@ -1,4 +1,4 @@
-{stdenv, fetchurl, qt, libupnp, gpgme, gnome_keyring, glib}:
+{stdenv, fetchurl, qt, libupnp, gpgme, libgnome_keyring, glib}:
 
 throw "still fails to build"
 
@@ -10,7 +10,7 @@ stdenv.mkDerivation {
     sha256 = "15971wxx8djwcxn170jyn0mlh7cfzqsf031aa849wr9z234gwrcn";
   };
 
-  buildInputs = [ qt libupnp gpgme gnome_keyring glib ];
+  buildInputs = [ qt libupnp gpgme libgnome_keyring glib ];
 
   buildPhase = ''
     cd libbitdht/src
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index c8e889cb88df..b77d1d55f0d5 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -6420,8 +6420,7 @@ let
   darcs = haskellPackages.darcs;
 
   darktable = callPackage ../applications/graphics/darktable {
-    inherit (gnome) GConf gnome_keyring libglade atk;
-    inherit (xlibs) libxcb pixman libpthreadstubs libXau;
+    inherit (gnome) GConf libglade atk;
   };
 
   dia = callPackage ../applications/graphics/dia {
@@ -6595,7 +6594,7 @@ let
   # higher priority.
   evince = hiPrio (callPackage ../applications/misc/evince {
     inherit (gnome) gnomedocutils gnomeicontheme libgnome
-      libgnomeui libglade glib gtk scrollkeeper gnome_keyring;
+      libgnomeui libglade scrollkeeper;
   });
 
   evolution_data_server = newScope (gnome // gtkLibs) ../servers/evolution-data-server { };
@@ -7281,7 +7280,6 @@ let
 
   retroshare = callPackage ../applications/networking/p2p/retroshare {
     qt = qt4;
-    inherit (gnome) gnome_keyring;
   };
 
   rsync = callPackage ../applications/networking/sync/rsync {