diff options
author | Jörg Thalheim <Mic92@users.noreply.github.com> | 2017-04-04 16:14:09 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2017-04-04 16:14:09 +0200 |
commit | 15c2af400ce71579cd8df90e2e131edb4523582f (patch) | |
tree | 9c154456df884c5588c423b81334127884e755b7 | |
parent | 01dbf03628fbddff46b60354407d23497c25a566 (diff) | |
parent | fccce068c397ff2e97a686babbb9604e4e88c20e (diff) | |
download | nixlib-15c2af400ce71579cd8df90e2e131edb4523582f.tar nixlib-15c2af400ce71579cd8df90e2e131edb4523582f.tar.gz nixlib-15c2af400ce71579cd8df90e2e131edb4523582f.tar.bz2 nixlib-15c2af400ce71579cd8df90e2e131edb4523582f.tar.lz nixlib-15c2af400ce71579cd8df90e2e131edb4523582f.tar.xz nixlib-15c2af400ce71579cd8df90e2e131edb4523582f.tar.zst nixlib-15c2af400ce71579cd8df90e2e131edb4523582f.zip |
Merge pull request #24617 from Mic92/baobab
baobab: fix missing dconf module
-rw-r--r-- | pkgs/desktops/gnome-3/3.22/core/baobab/default.nix | 17 |
1 files changed, 4 insertions, 13 deletions
diff --git a/pkgs/desktops/gnome-3/3.22/core/baobab/default.nix b/pkgs/desktops/gnome-3/3.22/core/baobab/default.nix index f7a0ff473cc1..15db270e80c5 100644 --- a/pkgs/desktops/gnome-3/3.22/core/baobab/default.nix +++ b/pkgs/desktops/gnome-3/3.22/core/baobab/default.nix @@ -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; |