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

Pass libgnome_keyring, not gnome_keyring

Browse Source 
svn path=/nixpkgs/trunk/; revision=33082
This commit is contained in:
Yury G. Kudryashov 2012-03-14 19:35:55 +00:00
parent 8167b5a2a7
commit f105c2353b
5 changed files with 10 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
pkgs/applications/graphics/darktable/default.nix
View File

@ -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

4
pkgs/applications/misc/evince/default.nix
View File

@ -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

4
pkgs/applications/misc/mysql-workbench/default.nix
View File

@ -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 ];

4
pkgs/applications/networking/p2p/retroshare/default.nix
View File

@ -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

6
pkgs/top-level/all-packages.nix
View File

@ -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 {