about summary refs log tree commit diff
diff options
context:
space:
mode:
authorYury G. Kudryashov <urkud.urkud@gmail.com>2012-03-17 16:45:56 +0000
committerYury G. Kudryashov <urkud.urkud@gmail.com>2012-03-17 16:45:56 +0000
commitddb01436a017b045264dcbda63664052b9a1a3dc (patch)
treebe51eaf3e594ce9a993ae502516506e590420647
parent60669aa0fc299ccbf0a09f7e696757767db391dd (diff)
downloadnixlib-ddb01436a017b045264dcbda63664052b9a1a3dc.tar
nixlib-ddb01436a017b045264dcbda63664052b9a1a3dc.tar.gz
nixlib-ddb01436a017b045264dcbda63664052b9a1a3dc.tar.bz2
nixlib-ddb01436a017b045264dcbda63664052b9a1a3dc.tar.lz
nixlib-ddb01436a017b045264dcbda63664052b9a1a3dc.tar.xz
nixlib-ddb01436a017b045264dcbda63664052b9a1a3dc.tar.zst
nixlib-ddb01436a017b045264dcbda63664052b9a1a3dc.zip
Move gnome3.libgnome_keyring to libgnome_keyring3
svn path=/nixpkgs/branches/glib-2.30-take2/; revision=33200
-rw-r--r--pkgs/desktops/gnome-3/default.nix2
-rw-r--r--pkgs/development/libraries/libgnome-keyring/3.x.nix (renamed from pkgs/desktops/gnome-3/platform/libgnome-keyring.nix)0
-rw-r--r--pkgs/top-level/all-packages.nix1
3 files changed, 1 insertions, 2 deletions
diff --git a/pkgs/desktops/gnome-3/default.nix b/pkgs/desktops/gnome-3/default.nix
index d49fca175219..b74438100a68 100644
--- a/pkgs/desktops/gnome-3/default.nix
+++ b/pkgs/desktops/gnome-3/default.nix
@@ -3,8 +3,6 @@
 {
   clutter = callPackage ./platform/clutter.nix { };
 
-  libgnome_keyring = callPackage ./platform/libgnome-keyring.nix { };
-
   GConf = callPackage ./platform/GConf.nix { };
 
   gnome_user_docs = callPackage ./platform/gnome-user-docs.nix { };
diff --git a/pkgs/desktops/gnome-3/platform/libgnome-keyring.nix b/pkgs/development/libraries/libgnome-keyring/3.x.nix
index a8b8e98ced99..a8b8e98ced99 100644
--- a/pkgs/desktops/gnome-3/platform/libgnome-keyring.nix
+++ b/pkgs/development/libraries/libgnome-keyring/3.x.nix
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index ba0b02a0124f..363fb7c6b97d 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -3966,6 +3966,7 @@ let
   libgdata_0_6 = (newScope gnome) ../development/libraries/libgdata/0.6.nix {};
 
   libgnome_keyring = callPackage ../development/libraries/libgnome-keyring { };
+  libgnome_keyring3 = callPackage ../development/libraries/libgnome-keyring/3.x.nix { };
 
   liblo = callPackage ../development/libraries/liblo { };