BoomMicrophone/nixpkgs-suyu
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge pull request #87202 from r-ryantm/auto-update/glade

Browse source 
gnome3.glade: 3.22.2 -> 3.36.0
This commit is contained in:
Tor Hedin Brønner 2020-05-15 20:52:25 +02:00 committed by GitHub
commit 59e2e44f5b
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
6 changed files with 84 additions and 43 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

37
pkgs/desktops/gnome-3/apps/glade/default.nix
View file

@ -1,37 +0,0 @@
{ stdenv, intltool, fetchurl, python3
, pkgconfig, gtk3, glib, gobject-introspection
, wrapGAppsHook, itstool, libxml2, docbook_xsl
, gnome3, gdk-pixbuf, libxslt, gsettings-desktop-schemas }:
stdenv.mkDerivation rec {
pname = "glade";
version = "3.22.2";
src = fetchurl {
url = "mirror://gnome/sources/glade/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
sha256 = "08bayb1rrpblxf6jhhbw2n3c425w170is4l94pampldl4kmsdvzd";
};
passthru = {
updateScript = gnome3.updateScript { packageName = "glade"; attrPath = "gnome3.glade"; };
};
nativeBuildInputs = [
pkgconfig intltool itstool wrapGAppsHook docbook_xsl libxslt libxml2 gobject-introspection
];
buildInputs = [
gtk3 glib libxml2 python3 python3.pkgs.pygobject3
gsettings-desktop-schemas
gdk-pixbuf gnome3.adwaita-icon-theme
];
enableParallelBuilding = true;
meta = with stdenv.lib; {
homepage = "https://wiki.gnome.org/Apps/Glade";
description = "User interface designer for GTK applications";
maintainers = teams.gnome.members;
license = licenses.lgpl2;
platforms = platforms.linux;
};
}

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

16
pkgs/development/libraries/libhandy/default.nix
View file

@ -1,6 +1,6 @@
{ stdenv, fetchFromGitLab, meson, ninja, pkgconfig, gobject-introspection, vala
{ stdenv, fetchFromGitLab, fetchpatch, 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
}:
@ -20,11 +20,21 @@ stdenv.mkDerivation rec {
sha256 = "1y23k623sjkldfrdiwfarpchg5mg58smcy1pkgnwfwca15wm1ra5";
};
patches = [
# Fix build with Glade 3.36.0
# https://source.puri.sm/Librem5/libhandy/merge_requests/451
(fetchpatch {
url = "https://source.puri.sm/Librem5/libhandy/commit/887beedb467984ab5c7b91830181645fadef7849.patch";
sha256 = "ZW6qCtHhXMsLsxgcOjVAukgPAhOdvFhxx0iAQEEk8GE=";
excludes = [ "glade/glade-hdy-header-bar.c" ];
})
];
nativeBuildInputs = [
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 = [

65
pkgs/development/tools/glade/default.nix Normal file
View file

@ -0,0 +1,65 @@
{ stdenv
, gettext
, fetchurl
, python3
, pkg-config
, gtk3
, glib
, gobject-introspection
, wrapGAppsHook
, itstool
, libxml2
, docbook-xsl-nons
, gnome3
, gdk-pixbuf
, libxslt
, gsettings-desktop-schemas
}:
stdenv.mkDerivation rec {
pname = "glade";
version = "3.36.0";
src = fetchurl {
url = "mirror://gnome/sources/glade/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
sha256 = "GbVGtSfMRiE8z8gCLUnsV+YY/iyqmqUdstKGIjPqbwg=";
};
nativeBuildInputs = [
pkg-config
gettext
itstool
wrapGAppsHook
docbook-xsl-nons
libxslt
libxml2
gobject-introspection
];
buildInputs = [
gtk3
glib
libxml2
python3
python3.pkgs.pygobject3
gsettings-desktop-schemas
gdk-pixbuf
gnome3.adwaita-icon-theme
];
enableParallelBuilding = true;
passthru = {
updateScript = gnome3.updateScript {
packageName = pname;
};
};
meta = with stdenv.lib; {
homepage = "https://wiki.gnome.org/Apps/Glade";
description = "User interface designer for GTK applications";
maintainers = teams.gnome.members;
license = licenses.lgpl2;
platforms = platforms.linux;
};
}

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 {};