From aaaf48b2aa4e96143faa55be0b27d1bd0635c0eb Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Sun, 2 Dec 2018 22:32:40 +0100 Subject: [PATCH] libgda: move from gnome3.libgda --- pkgs/desktops/gnome-3/default.nix | 4 +--- .../gnome-3/misc => development/libraries}/libgda/default.nix | 0 pkgs/top-level/all-packages.nix | 2 ++ 3 files changed, 3 insertions(+), 3 deletions(-) rename pkgs/{desktops/gnome-3/misc => development/libraries}/libgda/default.nix (100%) diff --git a/pkgs/desktops/gnome-3/default.nix b/pkgs/desktops/gnome-3/default.nix index 436b12d1064..626f4652ece 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 similarity index 100% rename from pkgs/desktops/gnome-3/misc/libgda/default.nix rename to pkgs/development/libraries/libgda/default.nix diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 2ddb4755c32..4e0d4e74f92 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 { };