git.iko.soy/typeable/nixpkgs
on master help sign in
glade: 3.32.2 → 3.36.0

https://ftp.gnome.org/pub/GNOME/sources/glade/3.36/glade-3.36.0.news

commite20c3296a459b3607de38976e536bac875a5bca7 authorJan Tojnar <jtojnar@gmail.com> dateFri 15 May 2020, 18:29 (7 years ago) parentfe7e564
2 files changed+15−5
pkgs/development/libraries/libhandy/default.nix+11−1 pkgs/development/tools/glade/default.nix+4−4
pkgs/development/libraries/libhandy/default.nix+11−1
@@ -1,4 +1,4 @@
1−{ stdenv, fetchFromGitLab, meson, ninja, pkgconfig, gobject-introspection, vala
1+{ stdenv, fetchFromGitLab, fetchpatch, meson, ninja, pkgconfig, gobject-introspection, vala
22, gtk-doc, docbook_xsl, docbook_xml_dtd_43
33, gtk3, gnome3, glade
44, dbus, xvfb_run, libxml2
@@ -20,6 +20,16 @@ stdenv.mkDerivation rec {
2020 sha256 = "1y23k623sjkldfrdiwfarpchg5mg58smcy1pkgnwfwca15wm1ra5";
2121 };
2222
23+ patches = [
24+ # Fix build with Glade 3.36.0
25+ # https://source.puri.sm/Librem5/libhandy/merge_requests/451
26+ (fetchpatch {
27+ url = "https://source.puri.sm/Librem5/libhandy/commit/887beedb467984ab5c7b91830181645fadef7849.patch";
28+ sha256 = "ZW6qCtHhXMsLsxgcOjVAukgPAhOdvFhxx0iAQEEk8GE=";
29+ excludes = [ "glade/glade-hdy-header-bar.c" ];
30+ })
31+ ];
32+
2333 nativeBuildInputs = [
2434 meson ninja pkgconfig gobject-introspection vala libxml2
2535 gtk-doc docbook_xsl docbook_xml_dtd_43
pkgs/development/tools/glade/default.nix+4−4
@@ -1,5 +1,5 @@
11{ stdenv
2−, intltool
2+, gettext
33, fetchurl
44, python3
55, pkg-config
@@ -18,16 +18,16 @@
1818
1919stdenv.mkDerivation rec {
2020 pname = "glade";
21− version = "3.22.2";
21+ version = "3.36.0";
2222
2323 src = fetchurl {
2424 url = "mirror://gnome/sources/glade/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
25− sha256 = "08bayb1rrpblxf6jhhbw2n3c425w170is4l94pampldl4kmsdvzd";
25+ sha256 = "GbVGtSfMRiE8z8gCLUnsV+YY/iyqmqUdstKGIjPqbwg=";
2626 };
2727
2828 nativeBuildInputs = [
2929 pkg-config
30− intltool
30+ gettext
3131 itstool
3232 wrapGAppsHook
3333 docbook-xsl-nons