JakeHillion/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

glade: rename from gnome3.glade

Browse Source
This commit is contained in:
Jan Tojnar 2020-05-15 17:29:00 +02:00
parent 7319061eef
commit 6b17638dc6
No known key found for this signature in database
GPG Key ID: 7FAB2A15F7A607A4
5 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
pkgs/applications/editors/gnome-builder/default.nix
View File

@ -9,6 +9,7 @@
, gnome3
, libgit2-glib
, gobject-introspection
, glade
, gspell
, gtk-doc
, gtk3
@ -65,7 +66,7 @@ stdenv.mkDerivation rec {
ctags
flatpak
gnome3.devhelp
gnome3.glade
glade
libgit2-glib
libpeas
libportal

4
pkgs/desktops/gnome-3/default.nix
View File

@ -164,8 +164,6 @@ lib.makeScope pkgs.newScope (self: with self; {
ghex = callPackage ./apps/ghex { };
glade = callPackage ./apps/glade { };
gnome-books = callPackage ./apps/gnome-books { };
gnome-boxes = callPackage ./apps/gnome-boxes { };
@ -352,6 +350,8 @@ lib.makeScope pkgs.newScope (self: with self; {
inherit (pkgs) networkmanagerapplet; # added 2019-12-12
inherit (pkgs) glade; # added 2020-05-15
vino = throw "vino is deprecated, use gnome-remote-desktop instead."; # added 2020-03-13
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

4
pkgs/development/libraries/libhandy/default.nix
View File

@ -1,6 +1,6 @@
{ stdenv, fetchFromGitLab, meson, ninja, pkgconfig, gobject-introspection, vala
, gtk-doc, docbook_xsl, docbook_xml_dtd_43
, gtk3, gnome3
, gtk3, gnome3, glade
, dbus, xvfb_run, libxml2
, hicolor-icon-theme
}:
@ -24,7 +24,7 @@ stdenv.mkDerivation rec {
meson ninja pkgconfig gobject-introspection vala libxml2
gtk-doc docbook_xsl docbook_xml_dtd_43
];
buildInputs = [ gnome3.gnome-desktop gtk3 gnome3.glade libxml2 ];
buildInputs = [ gnome3.gnome-desktop gtk3 glade libxml2 ];
checkInputs = [ dbus xvfb_run hicolor-icon-theme ];
mesonFlags = [

2
pkgs/desktops/gnome-3/apps/glade/default.nix → pkgs/development/tools/glade/default.nix
View File

@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
};
passthru = {
updateScript = gnome3.updateScript { packageName = "glade"; attrPath = "gnome3.glade"; };
updateScript = gnome3.updateScript { packageName = "glade"; };
};
nativeBuildInputs = [

2
pkgs/top-level/all-packages.nix
View File

@ -181,6 +181,8 @@ in
deadcode = callPackage ../development/tools/deadcode { };
glade = callPackage ../development/tools/glade { };
hobbes = callPackage ../development/tools/hobbes { stdenv = gcc6Stdenv; }; # GCC 6 is latest currently supported. See https://git.io/JvK6M.
proto-contrib = callPackage ../development/tools/proto-contrib {};