gucharmap: 12.0.1 -> 13.0.0

12.1.0 has switched from autotools to meson.

Fix build after #82721.
This commit is contained in:
Orivej Desh 2020-03-19 18:46:09 +00:00
parent e34636737c
commit bdf9aad7b2

View File

@ -1,15 +1,15 @@
{ stdenv { stdenv
, intltool , intltool
, fetchFromGitLab , fetchFromGitLab
, fetchpatch , meson
, ninja
, pkgconfig , pkgconfig
, python3
, gtk3 , gtk3
, adwaita-icon-theme , adwaita-icon-theme
, glib , glib
, desktop-file-utils , desktop-file-utils
, gtk-doc , gtk-doc
, autoconf
, automake
, libtool , libtool
, wrapGAppsHook , wrapGAppsHook
, gnome3 , gnome3
@ -45,7 +45,7 @@ let
}; };
in stdenv.mkDerivation rec { in stdenv.mkDerivation rec {
pname = "gucharmap"; pname = "gucharmap";
version = "12.0.1"; version = "13.0.0";
outputs = [ "out" "lib" "dev" "devdoc" ]; outputs = [ "out" "lib" "dev" "devdoc" ];
@ -54,25 +54,18 @@ in stdenv.mkDerivation rec {
owner = "GNOME"; owner = "GNOME";
repo = pname; repo = pname;
rev = version; rev = version;
sha256 = "0si3ymyfzc5v7ly0dmcs3qgw2wp8cyasycq5hmcr8frl09lr6gkw"; sha256 = "17arjigs1lw1h428s9g171n0idrpf9ks23sndldsik1zvvwzlldh";
}; };
patches = [
# fix build with Unicode 12.1
(fetchpatch {
url = "https://salsa.debian.org/gnome-team/gucharmap/raw/de079ad494a15f662416257fca2f2b8db757f4ea/debian/patches/update-to-unicode-12.1.patch";
sha256 = "093gqsxfpp3s0b88p1dgkskr4ng3hv8irmxc60l3fdrkl8am00xh";
})
];
nativeBuildInputs = [ nativeBuildInputs = [
meson
ninja
pkgconfig pkgconfig
python3
wrapGAppsHook wrapGAppsHook
unzip unzip
intltool intltool
itstool itstool
autoconf
automake
libtool libtool
gtk-doc gtk-doc
docbook_xsl docbook_xsl
@ -90,19 +83,15 @@ in stdenv.mkDerivation rec {
adwaita-icon-theme adwaita-icon-theme
]; ];
configureFlags = [ mesonFlags = [
"--with-unicode-data=${ucd}/share/unicode" "-Ducd_path=${ucd}/share/unicode"
"--enable-gtk-doc" "-Dvapi=false"
]; ];
doCheck = true; doCheck = true;
postPatch = '' postPatch = ''
patchShebangs gucharmap/gen-guch-unicode-tables.pl patchShebangs data/meson_desktopfile.py gucharmap/gen-guch-unicode-tables.pl gucharmap/meson_compileschemas.py
'';
preConfigure = ''
NOCONFIGURE=1 ./autogen.sh
''; '';
passthru = { passthru = {