about summary refs log tree commit diff
path: root/pkgs
diff options
context:
space:
mode:
authorJan Tojnar <jtojnar@gmail.com>2018-12-02 22:32:40 +0100
committerJan Tojnar <jtojnar@gmail.com>2018-12-12 20:00:59 +0100
commitaaaf48b2aa4e96143faa55be0b27d1bd0635c0eb (patch)
treefc2495e574e7134f4efe41640dd76c4549fe6e42 /pkgs
parent929bf748e81a78cff5606ed61173dff11f8980fb (diff)
downloadnixlib-aaaf48b2aa4e96143faa55be0b27d1bd0635c0eb.tar
nixlib-aaaf48b2aa4e96143faa55be0b27d1bd0635c0eb.tar.gz
nixlib-aaaf48b2aa4e96143faa55be0b27d1bd0635c0eb.tar.bz2
nixlib-aaaf48b2aa4e96143faa55be0b27d1bd0635c0eb.tar.lz
nixlib-aaaf48b2aa4e96143faa55be0b27d1bd0635c0eb.tar.xz
nixlib-aaaf48b2aa4e96143faa55be0b27d1bd0635c0eb.tar.zst
nixlib-aaaf48b2aa4e96143faa55be0b27d1bd0635c0eb.zip
libgda: move from gnome3.libgda
Diffstat (limited to 'pkgs')
-rw-r--r--pkgs/desktops/gnome-3/default.nix4
-rw-r--r--pkgs/development/libraries/libgda/default.nix (renamed from pkgs/desktops/gnome-3/misc/libgda/default.nix)0
-rw-r--r--pkgs/top-level/all-packages.nix2
3 files changed, 3 insertions, 3 deletions
diff --git a/pkgs/desktops/gnome-3/default.nix b/pkgs/desktops/gnome-3/default.nix
index 436b12d10644..626f4652ecec 100644
--- a/pkgs/desktops/gnome-3/default.nix
+++ b/pkgs/desktops/gnome-3/default.nix
@@ -38,7 +38,7 @@ lib.makeScope pkgs.newScope (self: with self; {
   inherit (pkgs) atk glib gobject-introspection gspell webkitgtk gtk3 gtkmm3
     libgtop libgudev libhttpseverywhere librsvg libsecret gdk_pixbuf gtksourceview gtksourceview4
     easytag meld orca rhythmbox shotwell gnome-usage
-    clutter clutter-gst clutter-gtk cogl gtk-vnc libdazzle;
+    clutter clutter-gst clutter-gtk cogl gtk-vnc libdazzle libgda;
 
   libsoup = pkgs.libsoup.override { gnomeSupport = true; };
   libchamplain = pkgs.libchamplain.override { libsoup = libsoup; };
@@ -371,8 +371,6 @@ lib.makeScope pkgs.newScope (self: with self; {
 
   libgnome-games-support = callPackage ./misc/libgnome-games-support { };
 
-  libgda = callPackage ./misc/libgda { };
-
   libgit2-glib = callPackage ./misc/libgit2-glib { };
 
   libmediaart = callPackage ./misc/libmediaart { };
diff --git a/pkgs/desktops/gnome-3/misc/libgda/default.nix b/pkgs/development/libraries/libgda/default.nix
index 93e18f519163..93e18f519163 100644
--- a/pkgs/desktops/gnome-3/misc/libgda/default.nix
+++ b/pkgs/development/libraries/libgda/default.nix
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 2ddb4755c32b..4e0d4e74f929 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -10732,6 +10732,8 @@ in
   });
   libgap = callPackage ../development/libraries/libgap { };
 
+  libgda = callPackage ../development/libraries/libgda { };
+
   libgdata = gnome3.libgdata;
 
   libgig = callPackage ../development/libraries/libgig { };