diff options
author | Albert Safin <xzfcpw@gmail.com> | 2017-09-28 07:27:11 +0700 |
---|---|---|
committer | Albert Safin <xzfcpw@gmail.com> | 2017-09-29 02:25:41 +0700 |
commit | 1ae19b6c4e9790495dc108e58726b34274562f41 (patch) | |
tree | 613af15c5ad73047058ba792d18fd064bb73bb27 | |
parent | 35c15d4a61be8e9fb56410077c16dfb092e4ae1b (diff) |
gucharmap: 3.18.2 -> 10.0.1
- Gucharmap no longer follow the GNOME major versioning. - Gucharmap no longer includes Unicode data. Instead the data should be downloaded from unicode.org.
-rwxr-xr-x | maintainers/scripts/gnome.sh | 2 | ||||
-rw-r--r-- | pkgs/desktops/gnome-3/core/gucharmap/default.nix | 20 | ||||
-rw-r--r-- | pkgs/desktops/gnome-3/core/gucharmap/src.nix | 6 | ||||
-rw-r--r-- | pkgs/desktops/gnome-3/core/gucharmap/unicode-data.nix | 44 |
4 files changed, 59 insertions, 13 deletions
diff --git a/maintainers/scripts/gnome.sh b/maintainers/scripts/gnome.sh index f77dc5a9e64cc..d44bda53f8d68 100755 --- a/maintainers/scripts/gnome.sh +++ b/maintainers/scripts/gnome.sh @@ -6,7 +6,7 @@ GNOME_FTP=ftp.gnome.org/pub/GNOME/sources # projects that don't follow the GNOME major versioning, or that we don't want to # programmatically update -NO_GNOME_MAJOR="ghex gtkhtml gdm" +NO_GNOME_MAJOR="ghex gtkhtml gdm gucharmap" usage() { echo "Usage: $0 <show project>|<update project>|<update-all> [major.minor]" >&2 diff --git a/pkgs/desktops/gnome-3/core/gucharmap/default.nix b/pkgs/desktops/gnome-3/core/gucharmap/default.nix index 05aff866606f4..58d9901ad0129 100644 --- a/pkgs/desktops/gnome-3/core/gucharmap/default.nix +++ b/pkgs/desktops/gnome-3/core/gucharmap/default.nix @@ -1,6 +1,7 @@ { stdenv, intltool, fetchurl, pkgconfig, gtk3 , glib, desktop_file_utils, bash, appdata-tools -, makeWrapper, gnome3, file, itstool, libxml2 }: +, wrapGAppsHook, gnome3, itstool, libxml2 +, callPackage, unzip }: # TODO: icons and theme still does not work # use packaged gnome3.adwaita-icon-theme @@ -12,16 +13,17 @@ stdenv.mkDerivation rec { propagatedUserEnvPkgs = [ gnome3.gnome_themes_standard ]; - preConfigure = "substituteInPlace ./configure --replace /usr/bin/file ${file}/bin/file"; + preConfigure = "patchShebangs gucharmap/gen-guch-unicode-tables.pl"; - buildInputs = [ pkgconfig gtk3 intltool itstool glib appdata-tools - gnome3.yelp_tools libxml2 file desktop_file_utils - gnome3.gsettings_desktop_schemas makeWrapper ]; + nativeBuildInputs = [ pkgconfig wrapGAppsHook unzip ]; - preFixup = '' - wrapProgram "$out/bin/gucharmap" \ - --prefix XDG_DATA_DIRS : "${gnome3.gnome_themes_standard}/share:$out/share:$GSETTINGS_SCHEMAS_PATH" - ''; + buildInputs = [ gtk3 intltool itstool glib appdata-tools + gnome3.yelp_tools libxml2 desktop_file_utils + gnome3.gsettings_desktop_schemas ]; + + unicode-data = callPackage ./unicode-data.nix {}; + + configureFlags = "--with-unicode-data=${unicode-data}"; meta = with stdenv.lib; { homepage = https://wiki.gnome.org/Apps/Gucharmap; diff --git a/pkgs/desktops/gnome-3/core/gucharmap/src.nix b/pkgs/desktops/gnome-3/core/gucharmap/src.nix index 69c0dd600251d..67d00c269f532 100644 --- a/pkgs/desktops/gnome-3/core/gucharmap/src.nix +++ b/pkgs/desktops/gnome-3/core/gucharmap/src.nix @@ -1,10 +1,10 @@ # Autogenerated by maintainers/scripts/gnome.sh update fetchurl: { - name = "gucharmap-3.18.2"; + name = "gucharmap-10.0.1"; src = fetchurl { - url = mirror://gnome/sources/gucharmap/3.18/gucharmap-3.18.2.tar.xz; - sha256 = "80141d3e892c3c4812c1a8fad8f89978559ef19e933843267e6e9a5524c09ec9"; + url = mirror://gnome/sources/gucharmap/10.0/gucharmap-10.0.1.tar.xz; + sha256 = "51a2bf91c4590ea2159f828156864f088a0bd4c12e7a1c396002a23d48b2d5e2"; }; } diff --git a/pkgs/desktops/gnome-3/core/gucharmap/unicode-data.nix b/pkgs/desktops/gnome-3/core/gucharmap/unicode-data.nix new file mode 100644 index 0000000000000..84770a17162ce --- /dev/null +++ b/pkgs/desktops/gnome-3/core/gucharmap/unicode-data.nix @@ -0,0 +1,44 @@ +{fetchurl, stdenv}: +stdenv.mkDerivation { + name = "unicode-data-10.0.0"; + srcs = [ + (fetchurl { + url = "http://www.unicode.org/Public/10.0.0/ucd/Blocks.txt"; + sha256 = "19zf2kd198mcv1paa194c1zf36hay1irbxssi35yi2pd8ad69qas"; + }) + (fetchurl { + url = "http://www.unicode.org/Public/10.0.0/ucd/DerivedAge.txt"; + sha256 = "1h9p1g0wnh686l6cqar7cmky465vwc6vjzzn1s7v0i9zcjaqkr4h"; + }) + (fetchurl { + url = "http://www.unicode.org/Public/10.0.0/ucd/NamesList.txt"; + sha256 = "0gvpcyq852rnlqmx4y5i1by7bavvcw6rj40i54w48yc7xr3zmgd1"; + }) + (fetchurl { + url = "http://www.unicode.org/Public/10.0.0/ucd/Scripts.txt"; + sha256 = "0b9prz2hs6w61afqaplcxnv115f8yk4d5hn9dc5hks8nqpj28bnh"; + }) + (fetchurl { + url = "http://www.unicode.org/Public/10.0.0/ucd/UnicodeData.txt"; + sha256 = "1cfak1j753zcrbgixwgppyxhm4w8vda8vxhqymi7n5ljfi6kwhjj"; + }) + (fetchurl { + url = "http://www.unicode.org/Public/10.0.0/ucd/Unihan.zip"; + sha256 = "199kz6laypkvc0ykms6d7bkb571jmpds39sv2p7kd5jjm1ij08q1"; + }) + ]; + phases = "installPhase"; + installPhase = with stdenv.lib; '' + mkdir $out + for f in $srcs;do + cp $f $out/$(stripHash $f) + done + ''; + meta = with stdenv.lib; { + homepage = http://www.unicode.org/ucd/; + description = "Unicode Character Database"; + maintainers = gnome3.maintainers; + license = licenses.mit; + platforms = platforms.all; + }; +} |