JakeHillion/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

gnome3.gnome-desktop: clean up

Browse Source
This commit is contained in:
Jan Tojnar 2018-08-08 03:30:01 +02:00
parent 0c9273509a
commit f48108e52a
No known key found for this signature in database
GPG Key ID: 7FAB2A15F7A607A4
1 changed files with 18 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
pkgs/desktops/gnome-3/core/gnome-desktop/default.nix
View File

@ -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 ];