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

libhandy_0: disable glade catalog

Browse Source 
It does not work with recent glade.
This commit is contained in:
Jan Tojnar 2020-11-17 18:13:36 +01:00
parent ab7661ed7c
commit 4a99872c97
No known key found for this signature in database
GPG Key ID: 7FAB2A15F7A607A4
1 changed files with 5 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
pkgs/development/libraries/libhandy/0.x.nix
View File

@ -1,6 +1,6 @@
{ stdenv, fetchFromGitLab, fetchpatch, meson, ninja, pkgconfig, gobject-introspection, vala { stdenv, fetchFromGitLab, meson, ninja, pkgconfig, gobject-introspection, vala
, gtk-doc, docbook_xsl, docbook_xml_dtd_43 , gtk-doc, docbook_xsl, docbook_xml_dtd_43
, gtk3, gnome3, glade , gtk3, gnome3
, dbus, xvfb_run, libxml2 , dbus, xvfb_run, libxml2
, hicolor-icon-theme , hicolor-icon-theme
}: }:
@ -9,7 +9,7 @@ stdenv.mkDerivation rec {
pname = "libhandy"; pname = "libhandy";
version = "0.0.13"; version = "0.0.13";
outputs = [ "out" "dev" "devdoc" "glade" ]; outputs = [ "out" "dev" "devdoc" ];
outputBin = "dev"; outputBin = "dev";
src = fetchFromGitLab { src = fetchFromGitLab {
@ -20,32 +20,19 @@ stdenv.mkDerivation rec {
sha256 = "1y23k623sjkldfrdiwfarpchg5mg58smcy1pkgnwfwca15wm1ra5"; 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 = "0qgh4i0l1028qxqmig4x2c10yj5s80skl70qnc5wnp71s45alvk5";
excludes = [ "glade/glade-hdy-header-bar.c" ];
})
];
nativeBuildInputs = [ nativeBuildInputs = [
meson ninja pkgconfig gobject-introspection vala libxml2 meson ninja pkgconfig gobject-introspection vala libxml2
gtk-doc docbook_xsl docbook_xml_dtd_43 gtk-doc docbook_xsl docbook_xml_dtd_43
]; ];
buildInputs = [ gnome3.gnome-desktop gtk3 glade libxml2 ]; buildInputs = [ gnome3.gnome-desktop gtk3 libxml2 ];
checkInputs = [ dbus xvfb_run hicolor-icon-theme ]; checkInputs = [ dbus xvfb_run hicolor-icon-theme ];
mesonFlags = [ mesonFlags = [
"-Dgtk_doc=true" "-Dgtk_doc=true"
"-Dglade_catalog=enabled" "-Dglade_catalog=disabled"
"-Dintrospection=enabled" "-Dintrospection=enabled"
]; ];
PKG_CONFIG_GLADEUI_2_0_MODULEDIR = "${placeholder "glade"}/lib/glade/modules";
PKG_CONFIG_GLADEUI_2_0_CATALOGDIR = "${placeholder "glade"}/share/glade/catalogs";
doCheck = true; doCheck = true;
checkPhase = '' checkPhase = ''