Merge pull request #24617 from Mic92/baobab

baobab: fix missing dconf module
This commit is contained in:
Jörg Thalheim 2017-04-04 16:14:09 +02:00 committed by GitHub
commit 15c2af400c

View File

@ -1,6 +1,6 @@
{ stdenv, intltool, fetchurl, vala_0_32, libgtop
{ stdenv, intltool, fetchurl, vala, libgtop
, pkgconfig, gtk3, glib
, bash, makeWrapper, itstool, libxml2
, bash, wrapGAppsHook, itstool, libxml2
, gnome3, librsvg, gdk_pixbuf, file }:
stdenv.mkDerivation rec {
@ -10,17 +10,8 @@ stdenv.mkDerivation rec {
NIX_CFLAGS_COMPILE = "-I${gnome3.glib.dev}/include/gio-unix-2.0";
propagatedUserEnvPkgs = [ gnome3.gnome_themes_standard ];
buildInputs = [ vala_0_32 pkgconfig gtk3 glib libgtop intltool itstool libxml2
gnome3.gsettings_desktop_schemas makeWrapper file
gdk_pixbuf gnome3.defaultIconTheme librsvg ];
preFixup = ''
wrapProgram "$out/bin/baobab" \
--set GDK_PIXBUF_MODULE_FILE "$GDK_PIXBUF_MODULE_FILE" \
--prefix XDG_DATA_DIRS : "${gnome3.gnome_themes_standard}/share:$out/share:$XDG_ICON_DIRS:$GSETTINGS_SCHEMAS_PATH"
'';
buildInputs = [ vala pkgconfig gtk3 glib libgtop intltool itstool libxml2
wrapGAppsHook file gdk_pixbuf gnome3.defaultIconTheme librsvg ];
meta = with stdenv.lib; {
homepage = https://wiki.gnome.org/Apps/Baobab;