diff options
author | Pascal Wittmann <mail@pascal-wittmann.de> | 2018-08-11 09:36:34 +0200 |
---|---|---|
committer | Pascal Wittmann <mail@pascal-wittmann.de> | 2018-08-11 09:36:34 +0200 |
commit | a34579e01ef2aca4b33381a5c189746a1b52e2f0 (patch) | |
tree | 70410891f5c55611a2d17d2d723f270ad022c391 /pkgs/desktops/gnome-3/core/gnome-desktop/default.nix | |
parent | af8cd3c74e80ff532b17568039ecc4f143992813 (diff) | |
parent | 40dea2488fec71f6224944c1b9dae280c2fcc2dc (diff) | |
download | nixpkgs-a34579e01ef2aca4b33381a5c189746a1b52e2f0.tar nixpkgs-a34579e01ef2aca4b33381a5c189746a1b52e2f0.tar.gz nixpkgs-a34579e01ef2aca4b33381a5c189746a1b52e2f0.tar.bz2 nixpkgs-a34579e01ef2aca4b33381a5c189746a1b52e2f0.tar.lz nixpkgs-a34579e01ef2aca4b33381a5c189746a1b52e2f0.tar.xz nixpkgs-a34579e01ef2aca4b33381a5c189746a1b52e2f0.tar.zst nixpkgs-a34579e01ef2aca4b33381a5c189746a1b52e2f0.zip |
Merge branch 'master' into add-missing-licenses
Conflicts: pkgs/tools/networking/network-manager/fortisslvpn.nix
Diffstat (limited to 'pkgs/desktops/gnome-3/core/gnome-desktop/default.nix')
-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 13f4b1ef638..e909a356866 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 ]; |