diff options
| author | Orivej Desh <orivej@gmx.fr> | 2020-03-19 18:46:09 +0000 |
|---|---|---|
| committer | Orivej Desh <orivej@gmx.fr> | 2020-03-19 18:51:16 +0000 |
| commit | bdf9aad7b25d4c645018e49321a98444b60979d8 (patch) | |
| tree | e9bf0396aedb14ce1aa0a25a83766cfeb3ddf5fe /pkgs/desktops/gnome-3 | |
| parent | e34636737cf611c7a34381e8a66f16d484b758d1 (diff) | |
| download | nixlib-bdf9aad7b25d4c645018e49321a98444b60979d8.tar nixlib-bdf9aad7b25d4c645018e49321a98444b60979d8.tar.gz nixlib-bdf9aad7b25d4c645018e49321a98444b60979d8.tar.bz2 nixlib-bdf9aad7b25d4c645018e49321a98444b60979d8.tar.lz nixlib-bdf9aad7b25d4c645018e49321a98444b60979d8.tar.xz nixlib-bdf9aad7b25d4c645018e49321a98444b60979d8.tar.zst nixlib-bdf9aad7b25d4c645018e49321a98444b60979d8.zip | |
gucharmap: 12.0.1 -> 13.0.0
12.1.0 has switched from autotools to meson. Fix build after #82721.
Diffstat (limited to 'pkgs/desktops/gnome-3')
| -rw-r--r-- | pkgs/desktops/gnome-3/core/gucharmap/default.nix | 35 |
1 files changed, 12 insertions, 23 deletions
diff --git a/pkgs/desktops/gnome-3/core/gucharmap/default.nix b/pkgs/desktops/gnome-3/core/gucharmap/default.nix index ce5e073ac064..3d2da33732b2 100644 --- a/pkgs/desktops/gnome-3/core/gucharmap/default.nix +++ b/pkgs/desktops/gnome-3/core/gucharmap/default.nix @@ -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 = { |