diff options
author | Jan Tojnar <jtojnar@gmail.com> | 2018-08-08 03:30:01 +0200 |
---|---|---|
committer | Jan Tojnar <jtojnar@gmail.com> | 2018-08-09 17:36:43 +0200 |
commit | f48108e52a51b3f2d1e1a461907fb6959c70ba1c (patch) | |
tree | 849b01d2d3cf4329ea3e530c820cdf54906c7bcd /pkgs/desktops/gnome-3 | |
parent | 0c9273509af3aa086b95046a3fdd2ebd34fe3e57 (diff) | |
download | nixlib-f48108e52a51b3f2d1e1a461907fb6959c70ba1c.tar nixlib-f48108e52a51b3f2d1e1a461907fb6959c70ba1c.tar.gz nixlib-f48108e52a51b3f2d1e1a461907fb6959c70ba1c.tar.bz2 nixlib-f48108e52a51b3f2d1e1a461907fb6959c70ba1c.tar.lz nixlib-f48108e52a51b3f2d1e1a461907fb6959c70ba1c.tar.xz nixlib-f48108e52a51b3f2d1e1a461907fb6959c70ba1c.tar.zst nixlib-f48108e52a51b3f2d1e1a461907fb6959c70ba1c.zip |
gnome3.gnome-desktop: clean up
Diffstat (limited to 'pkgs/desktops/gnome-3')
-rw-r--r-- | pkgs/desktops/gnome-3/core/gnome-desktop/default.nix | 26 |
1 files changed, 18 insertions, 8 deletions
diff --git a/pkgs/desktops/gnome-3/core/gnome-desktop/default.nix b/pkgs/desktops/gnome-3/core/gnome-desktop/default.nix index 13f4b1ef6389..e909a356866c 100644 --- a/pkgs/desktops/gnome-3/core/gnome-desktop/default.nix +++ b/pkgs/desktops/gnome-3/core/gnome-desktop/default.nix @@ -1,27 +1,26 @@ { stdenv, fetchurl, pkgconfig, libxslt, which, libX11, gnome3, gtk3, glib -, intltool, gnome-doc-utils, xkeyboard_config, isocodes, itstool, wayland -, libseccomp, bubblewrap, gobjectIntrospection }: +, intltool, libxml2, xkeyboard_config, isocodes, itstool, wayland +, libseccomp, bubblewrap, gobjectIntrospection, gtk-doc, docbook_xsl }: stdenv.mkDerivation rec { name = "gnome-desktop-${version}"; version = "3.28.2"; + outputs = [ "out" "dev" "devdoc" ]; + src = fetchurl { url = "mirror://gnome/sources/gnome-desktop/${gnome3.versionBranch version}/${name}.tar.xz"; sha256 = "0c439hhpfd9axmv4af6fzhibksh69pnn2nnbghbbqqbwy6zqfl30"; }; - passthru = { - updateScript = gnome3.updateScript { packageName = "gnome-desktop"; attrPath = "gnome3.gnome-desktop"; }; - }; - - # this should probably be setuphook for glib + # TODO: remove with 3.30 NIX_CFLAGS_COMPILE = "-I${glib.dev}/include/gio-unix-2.0"; enableParallelBuilding = true; nativeBuildInputs = [ - pkgconfig which itstool intltool libxslt gnome-doc-utils gobjectIntrospection + pkgconfig which itstool intltool libxslt libxml2 gobjectIntrospection + gtk-doc docbook_xsl ]; buildInputs = [ libX11 bubblewrap xkeyboard_config isocodes wayland @@ -34,11 +33,22 @@ stdenv.mkDerivation rec { ./bubblewrap-paths.patch ]; + configureFlags = [ + "--enable-gtk-doc" + ]; + postPatch = '' substituteInPlace libgnome-desktop/gnome-desktop-thumbnail-script.c --subst-var-by \ BUBBLEWRAP_BIN "${bubblewrap}/bin/bwrap" ''; + passthru = { + updateScript = gnome3.updateScript { + packageName = "gnome-desktop"; + attrPath = "gnome3.gnome-desktop"; + }; + }; + meta = with stdenv.lib; { description = "Library with common API for various GNOME modules"; license = with licenses; [ gpl2 lgpl2 ]; |