@@ -1,38 +1,58 @@
1−{ stdenv, fetchurl, meson, ninja, pkgconfig, gettext, gnome3, glib, gtk3, pango, wrapGAppsHook, python3
2−, gobject-introspection, gjs, libunistring, gsettings-desktop-schemas, adwaita-icon-theme, gnome-desktop }:
1+{ stdenv
2+, fetchurl
3+, meson
4+, ninja
5+, pkgconfig
6+, gettext
7+, gnome3
8+, glib
9+, gtk3
10+, pango
11+, wrapGAppsHook
12+, python3
13+, gobject-introspection
14+, gjs
15+, libunistring
16+, gsettings-desktop-schemas
17+, adwaita-icon-theme
18+, gnome-desktop
19+}:
320
421stdenv.mkDerivation rec {
5− name = "gnome-characters-${version}";
22+ pname = "gnome-characters";
623 version = "3.32.1";
724
825 src = fetchurl {
9− url = "mirror://gnome/sources/gnome-characters/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz";
26+ url = "mirror://gnome/sources/gnome-characters/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
1027 sha256 = "1mpg125x9k879ryg8xgbm9w1amx6b3iq9sqv7xfii7kzaanjb4js";
1128 };
1229
13− postPatch = ''
14− chmod +x meson_post_install.py # patchShebangs requires executable file
15− patchShebangs meson_post_install.py
16− '';
30+ nativeBuildInputs = [
31+ gettext
32+ gobject-introspection
33+ meson
34+ ninja
35+ pkgconfig
36+ python3
37+ wrapGAppsHook
38+ ];
1739
18− passthru = {
19− updateScript = gnome3.updateScript {
20− packageName = "gnome-characters";
21− attrPath = "gnome3.gnome-characters";
22− };
23− };
2440
25− nativeBuildInputs = [ meson ninja pkgconfig gettext wrapGAppsHook python3 gobject-introspection ];
2641 buildInputs = [
27− glib gtk3 gjs pango gsettings-desktop-schemas
28− adwaita-icon-theme libunistring
29− # typelib
30− gnome-desktop
42+ adwaita-icon-theme
43+ gjs
44+ glib
45+ gnome-desktop # for typelib
46+ gsettings-desktop-schemas
47+ gtk3
48+ libunistring
49+ pango
3150 ];
3251
33− mesonFlags = [
34− "-Ddbus_service_dir=${placeholder "out"}/share/dbus-1/services"
35− ];
52+ postPatch = ''
53+ chmod +x meson_post_install.py # patchShebangs requires executable file
54+ patchShebangs meson_post_install.py
55+ '';
3656
3757 dontWrapGApps = true;
3858
@@ -48,6 +68,13 @@ stdenv.mkDerivation rec {
4868 done
4969 '';
5070
71+ passthru = {
72+ updateScript = gnome3.updateScript {
73+ packageName = pname;
74+ attrPath = "gnome3.${pname}";
75+ };
76+ };
77+
5178 meta = with stdenv.lib; {
5279 homepage = https://wiki.gnome.org/Design/Apps/CharacterMap;
5380 description = "Simple utility application to find and insert unusual characters";