diff options
| author | Jan Tojnar <jtojnar@gmail.com> | 2020-05-15 18:29:11 +0200 |
|---|---|---|
| committer | Jan Tojnar <jtojnar@gmail.com> | 2020-05-15 19:26:02 +0200 |
| commit | e20c3296a459b3607de38976e536bac875a5bca7 (patch) | |
| tree | 004570f7987bc33530f2e6f9f5755eb0bd297b31 | |
| parent | fe7e564467acbc1e8b3009fab41c62c4de9f8a04 (diff) | |
| download | nixpkgs-e20c3296a459b3607de38976e536bac875a5bca7.tar nixpkgs-e20c3296a459b3607de38976e536bac875a5bca7.tar.gz nixpkgs-e20c3296a459b3607de38976e536bac875a5bca7.tar.bz2 nixpkgs-e20c3296a459b3607de38976e536bac875a5bca7.tar.lz nixpkgs-e20c3296a459b3607de38976e536bac875a5bca7.tar.xz nixpkgs-e20c3296a459b3607de38976e536bac875a5bca7.tar.zst nixpkgs-e20c3296a459b3607de38976e536bac875a5bca7.zip | |
glade: 3.32.2 → 3.36.0
https://ftp.gnome.org/pub/GNOME/sources/glade/3.36/glade-3.36.0.news
| -rw-r--r-- | pkgs/development/libraries/libhandy/default.nix | 12 | ||||
| -rw-r--r-- | pkgs/development/tools/glade/default.nix | 8 |
2 files changed, 15 insertions, 5 deletions
diff --git a/pkgs/development/libraries/libhandy/default.nix b/pkgs/development/libraries/libhandy/default.nix index 25186abb3aa..28816ab1307 100644 --- a/pkgs/development/libraries/libhandy/default.nix +++ b/pkgs/development/libraries/libhandy/default.nix @@ -1,4 +1,4 @@ -{ 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, glade , dbus, xvfb_run, libxml2 @@ -20,6 +20,16 @@ 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 diff --git a/pkgs/development/tools/glade/default.nix b/pkgs/development/tools/glade/default.nix index 13b3d8c2362..4d86fc2acd0 100644 --- a/pkgs/development/tools/glade/default.nix +++ b/pkgs/development/tools/glade/default.nix @@ -1,5 +1,5 @@ { stdenv -, intltool +, gettext , fetchurl , python3 , pkg-config @@ -18,16 +18,16 @@ stdenv.mkDerivation rec { pname = "glade"; - version = "3.22.2"; + version = "3.36.0"; src = fetchurl { url = "mirror://gnome/sources/glade/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "08bayb1rrpblxf6jhhbw2n3c425w170is4l94pampldl4kmsdvzd"; + sha256 = "GbVGtSfMRiE8z8gCLUnsV+YY/iyqmqUdstKGIjPqbwg="; }; nativeBuildInputs = [ pkg-config - intltool + gettext itstool wrapGAppsHook docbook-xsl-nons |