1
0
Fork 1
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-09-11 15:08:33 +01:00

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
, intltool
, fetchFromGitLab
, fetchpatch
, meson
, ninja
, pkgconfig
, python3
, gtk3
, adwaita-icon-theme
, glib
, desktop-file-utils
, gtk-doc
, autoconf
, automake
, libtool
, wrapGAppsHook
, gnome3
@ -45,7 +45,7 @@ let
};
in stdenv.mkDerivation rec {
pname = "gucharmap";
version = "12.0.1";
version = "13.0.0";
outputs = [ "out" "lib" "dev" "devdoc" ];
@ -54,25 +54,18 @@ in stdenv.mkDerivation rec {
owner = "GNOME";
repo = pname;
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 = [
meson
ninja
pkgconfig
python3
wrapGAppsHook
unzip
intltool
itstool
autoconf
automake
libtool
gtk-doc
docbook_xsl
@ -90,19 +83,15 @@ in stdenv.mkDerivation rec {
adwaita-icon-theme
];
configureFlags = [
"--with-unicode-data=${ucd}/share/unicode"
"--enable-gtk-doc"
mesonFlags = [
"-Ducd_path=${ucd}/share/unicode"
"-Dvapi=false"
];
doCheck = true;
postPatch = ''
patchShebangs gucharmap/gen-guch-unicode-tables.pl
'';
preConfigure = ''
NOCONFIGURE=1 ./autogen.sh
patchShebangs data/meson_desktopfile.py gucharmap/gen-guch-unicode-tables.pl gucharmap/meson_compileschemas.py
'';
passthru = {