diff options
author | Jan Tojnar <jtojnar@gmail.com> | 2019-01-19 07:28:06 +0100 |
---|---|---|
committer | Jan Tojnar <jtojnar@gmail.com> | 2019-01-21 12:03:34 +0100 |
commit | 437e478a50594ccf3508ed0688770ed9b888b78f (patch) | |
tree | 628386a29e776e28e4730bebd0c58d478db36a7e /pkgs/desktops | |
parent | dd3626c0365eab4280a076a638ce45c9ee1c9e99 (diff) | |
download | nixlib-437e478a50594ccf3508ed0688770ed9b888b78f.tar nixlib-437e478a50594ccf3508ed0688770ed9b888b78f.tar.gz nixlib-437e478a50594ccf3508ed0688770ed9b888b78f.tar.bz2 nixlib-437e478a50594ccf3508ed0688770ed9b888b78f.tar.lz nixlib-437e478a50594ccf3508ed0688770ed9b888b78f.tar.xz nixlib-437e478a50594ccf3508ed0688770ed9b888b78f.tar.zst nixlib-437e478a50594ccf3508ed0688770ed9b888b78f.zip |
gdl: rename from gnome3.gdl
Diffstat (limited to 'pkgs/desktops')
-rw-r--r-- | pkgs/desktops/gnome-3/default.nix | 4 | ||||
-rw-r--r-- | pkgs/desktops/gnome-3/devtools/anjuta/default.nix | 5 | ||||
-rw-r--r-- | pkgs/desktops/gnome-3/devtools/gdl/default.nix | 26 |
3 files changed, 4 insertions, 31 deletions
diff --git a/pkgs/desktops/gnome-3/default.nix b/pkgs/desktops/gnome-3/default.nix index 050a05223c46..7c028656faec 100644 --- a/pkgs/desktops/gnome-3/default.nix +++ b/pkgs/desktops/gnome-3/default.nix @@ -54,7 +54,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 gtksourceviewmm gtksourceview4 easytag meld orca rhythmbox shotwell gnome-usage - clutter clutter-gst clutter-gtk cogl gtk-vnc libdazzle libgda libgit2-glib libgxps libgdata libgepub libcroco libpeas libgee geocode-glib libgweather librest libzapojit libmediaart gfbgraph gexiv2 folks totem-pl-parser gcr gsound libgnomekbd vte vte_290 vte-ng gnome-menus; + clutter clutter-gst clutter-gtk cogl gtk-vnc libdazzle libgda libgit2-glib libgxps libgdata libgepub libcroco libpeas libgee geocode-glib libgweather librest libzapojit libmediaart gfbgraph gexiv2 folks totem-pl-parser gcr gsound libgnomekbd vte vte_290 vte-ng gnome-menus gdl; libsoup = pkgs.libsoup.override { gnomeSupport = true; }; libchamplain = pkgs.libchamplain.override { libsoup = libsoup; }; @@ -288,8 +288,6 @@ lib.makeScope pkgs.newScope (self: with self; { devhelp = callPackage ./devtools/devhelp { }; - gdl = callPackage ./devtools/gdl { }; - gnome-devel-docs = callPackage ./devtools/gnome-devel-docs { }; nemiver = callPackage ./devtools/nemiver { }; diff --git a/pkgs/desktops/gnome-3/devtools/anjuta/default.nix b/pkgs/desktops/gnome-3/devtools/anjuta/default.nix index 7dee751314f5..dcf0bd439420 100644 --- a/pkgs/desktops/gnome-3/devtools/anjuta/default.nix +++ b/pkgs/desktops/gnome-3/devtools/anjuta/default.nix @@ -1,4 +1,5 @@ { stdenv, fetchurl, pkgconfig, gnome3, gtk3, flex, bison, libxml2, intltool, + gdl, libgda, gtksourceview, itstool, python3, ncurses, makeWrapper }: stdenv.mkDerivation rec { @@ -22,8 +23,8 @@ stdenv.mkDerivation rec { ncurses ]; buildInputs = [ - flex bison gtk3 libxml2 gnome3.gjs gnome3.gdl - gnome3.libgda gnome3.gtksourceview + flex bison gtk3 libxml2 gnome3.gjs gdl + libgda gtksourceview gnome3.gsettings-desktop-schemas ]; diff --git a/pkgs/desktops/gnome-3/devtools/gdl/default.nix b/pkgs/desktops/gnome-3/devtools/gdl/default.nix deleted file mode 100644 index 5098ff3bd8bb..000000000000 --- a/pkgs/desktops/gnome-3/devtools/gdl/default.nix +++ /dev/null @@ -1,26 +0,0 @@ -{ stdenv, fetchurl, pkgconfig, libxml2, gtk3, gnome3, intltool }: - -stdenv.mkDerivation rec { - name = "gdl-${version}"; - version = "3.28.0"; - - src = fetchurl { - url = "mirror://gnome/sources/gdl/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz"; - sha256 = "1dipnzqpxl0yfwzl2lqdf6vb3174gb9f1d5jndkq8505q7n9ik2j"; - }; - - passthru = { - updateScript = gnome3.updateScript { packageName = "gdl"; attrPath = "gnome3.gdl"; }; - }; - - nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ libxml2 gtk3 intltool ]; - - meta = with stdenv.lib; { - description = "Gnome docking library"; - homepage = https://developer.gnome.org/gdl/; - maintainers = gnome3.maintainers; - license = licenses.gpl2; - platforms = platforms.linux; - }; -} |