diff options
author | Jan Tojnar <jtojnar@gmail.com> | 2018-08-08 17:08:58 +0200 |
---|---|---|
committer | Jan Tojnar <jtojnar@gmail.com> | 2018-08-09 17:36:46 +0200 |
commit | aab242e1c51e789a5bf2749a6c4d09c8f4bb6975 (patch) | |
tree | a5e0f3a5b977cb0166106bb691b491d2190825b3 /pkgs/desktops/gnome-3 | |
parent | 31559eb969150976d4a4e67e6943635cfd8dcef0 (diff) | |
download | nixlib-aab242e1c51e789a5bf2749a6c4d09c8f4bb6975.tar nixlib-aab242e1c51e789a5bf2749a6c4d09c8f4bb6975.tar.gz nixlib-aab242e1c51e789a5bf2749a6c4d09c8f4bb6975.tar.bz2 nixlib-aab242e1c51e789a5bf2749a6c4d09c8f4bb6975.tar.lz nixlib-aab242e1c51e789a5bf2749a6c4d09c8f4bb6975.tar.xz nixlib-aab242e1c51e789a5bf2749a6c4d09c8f4bb6975.tar.zst nixlib-aab242e1c51e789a5bf2749a6c4d09c8f4bb6975.zip |
gnome3.gucharmap: clean up
Clean up package, split into multiple outputs, enable devdoc.
Diffstat (limited to 'pkgs/desktops/gnome-3')
-rw-r--r-- | pkgs/desktops/gnome-3/core/gucharmap/default.nix | 27 |
1 files changed, 20 insertions, 7 deletions
diff --git a/pkgs/desktops/gnome-3/core/gucharmap/default.nix b/pkgs/desktops/gnome-3/core/gucharmap/default.nix index 861702a3986e..797eb00bd3ff 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, fetchFromGitLab, pkgconfig, gtk3, defaultIconTheme -, glib, desktop-file-utils, appdata-tools, gtk-doc, autoconf, automake, libtool -, wrapGAppsHook, gnome3, itstool, libxml2 +{ stdenv, intltool, fetchFromGitLab, fetchpatch, pkgconfig, gtk3, defaultIconTheme +, glib, desktop-file-utils, gtk-doc, autoconf, automake, libtool +, wrapGAppsHook, gnome3, itstool, libxml2, yelp-tools +, docbook_xsl, docbook_xml_dtd_412, gsettings-desktop-schemas , callPackage, unzip, gobjectIntrospection }: let @@ -9,6 +10,8 @@ in stdenv.mkDerivation rec { name = "gucharmap-${version}"; version = "11.0.1"; + outputs = [ "out" "lib" "dev" "devdoc" ]; + src = fetchFromGitLab { domain = "gitlab.gnome.org"; owner = "GNOME"; @@ -17,16 +20,26 @@ in stdenv.mkDerivation rec { sha256 = "13iw4fa6mv8vi8bkwk0bbhamnzbaih0c93p4rh07khq6mxa6hnpi"; }; + patches = [ + # Fix locale path to allow split outputs + # https://gitlab.gnome.org/GNOME/gucharmap/issues/10 + (fetchpatch { + url = https://gitlab.gnome.org/GNOME/gucharmap/commit/b2b03f16aa869ac0ec1a05c55c4d4e4c4b513576.patch; + sha256 = "1543mcyz96x23m9pzx04ny15m4a2pqmiksl1y5r51k3sw4fyisci"; + }) + ]; + nativeBuildInputs = [ - pkgconfig wrapGAppsHook unzip intltool itstool appdata-tools - autoconf automake libtool gtk-doc - gnome3.yelp-tools libxml2 desktop-file-utils gobjectIntrospection + pkgconfig wrapGAppsHook unzip intltool itstool + autoconf automake libtool gtk-doc docbook_xsl docbook_xml_dtd_412 + yelp-tools libxml2 desktop-file-utils gobjectIntrospection ]; - buildInputs = [ gtk3 glib gnome3.gsettings-desktop-schemas defaultIconTheme ]; + buildInputs = [ gtk3 glib gsettings-desktop-schemas defaultIconTheme ]; configureFlags = [ "--with-unicode-data=${unicode-data}" + "--enable-gtk-doc" ]; doCheck = true; |