git.iko.soy/typeable/nixpkgs
on master help sign in
glade: rename from gnome3.glade
commit6b17638dc6c052a3b2e132959a0f0e2b38f4310c authorJan Tojnar <jtojnar@gmail.com> dateFri 15 May 2020, 17:29 (7 years ago) parent7319061
5 files changed+9−6
pkgs/applications/editors/gnome-builder/default.nix+2−1 pkgs/desktops/gnome-3/default.nix+2−2 pkgs/development/libraries/libhandy/default.nix+2−2 pkgs/desktops/gnome-3/apps/glade/default.nix → pkgs/development/tools/glade/default.nix+1−1 pkgs/top-level/all-packages.nix+2
pkgs/applications/editors/gnome-builder/default.nix+2−1
@@ -9,6 +9,7 @@
99, gnome3
1010, libgit2-glib
1111, gobject-introspection
12+, glade
1213, gspell
1314, gtk-doc
1415, gtk3
@@ -65,7 +66,7 @@ stdenv.mkDerivation rec {
6566 ctags
6667 flatpak
6768 gnome3.devhelp
68− gnome3.glade
69+ glade
6970 libgit2-glib
7071 libpeas
7172 libportal
pkgs/desktops/gnome-3/default.nix+2−2
@@ -164,8 +164,6 @@ lib.makeScope pkgs.newScope (self: with self; {
164164
165165 ghex = callPackage ./apps/ghex { };
166166
167− glade = callPackage ./apps/glade { };
168−
169167 gnome-books = callPackage ./apps/gnome-books { };
170168
171169 gnome-boxes = callPackage ./apps/gnome-boxes { };
@@ -352,6 +350,8 @@ lib.makeScope pkgs.newScope (self: with self; {
352350
353351 inherit (pkgs) networkmanagerapplet; # added 2019-12-12
354352
353+ inherit (pkgs) glade; # added 2020-05-15
354+
355355 vino = throw "vino is deprecated, use gnome-remote-desktop instead."; # added 2020-03-13
356356
357357 gnome-screensaver = throw "gnome-screensaver is deprecated. If you are using GNOME Flashback, it now has a built-in lock screen. If you are using it elsewhere, you can try xscreenlock or other alternatives."; # added 2020-03-19
pkgs/development/libraries/libhandy/default.nix+2−2
@@ -1,6 +1,6 @@
11{ stdenv, fetchFromGitLab, meson, ninja, pkgconfig, gobject-introspection, vala
22, gtk-doc, docbook_xsl, docbook_xml_dtd_43
3−, gtk3, gnome3
3+, gtk3, gnome3, glade
44, dbus, xvfb_run, libxml2
55, hicolor-icon-theme
66}:
@@ -24,7 +24,7 @@ stdenv.mkDerivation rec {
2424 meson ninja pkgconfig gobject-introspection vala libxml2
2525 gtk-doc docbook_xsl docbook_xml_dtd_43
2626 ];
27− buildInputs = [ gnome3.gnome-desktop gtk3 gnome3.glade libxml2 ];
27+ buildInputs = [ gnome3.gnome-desktop gtk3 glade libxml2 ];
2828 checkInputs = [ dbus xvfb_run hicolor-icon-theme ];
2929
3030 mesonFlags = [
pkgs/desktops/gnome-3/apps/glade/default.nix → pkgs/development/tools/glade/default.nixrenamed+1−1
@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
1313 };
1414
1515 passthru = {
16− updateScript = gnome3.updateScript { packageName = "glade"; attrPath = "gnome3.glade"; };
16+ updateScript = gnome3.updateScript { packageName = "glade"; };
1717 };
1818
1919 nativeBuildInputs = [
pkgs/top-level/all-packages.nix+2
@@ -181,6 +181,8 @@ in
181181
182182 deadcode = callPackage ../development/tools/deadcode { };
183183
184+ glade = callPackage ../development/tools/glade { };
185+
184186 hobbes = callPackage ../development/tools/hobbes { stdenv = gcc6Stdenv; }; # GCC 6 is latest currently supported. See https://git.io/JvK6M.
185187
186188 proto-contrib = callPackage ../development/tools/proto-contrib {};