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

gitg: use wrapGAppsHook, pull in dconf (#18040)

Browse Source 
Without dconf, gitg doesn't remember preferences such as window size.
This commit is contained in:
Benjamin Herr 2016-08-28 09:55:51 +02:00 committed by Robin Gloster
parent 33638ca99e
commit dbae71570f
1 changed files with 8 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
pkgs/desktops/gnome-3/3.20/misc/gitg/default.nix
View File

@ -1,6 +1,8 @@
{ stdenv, fetchurl, fetchgit, vala_0_32, intltool, libgit2, pkgconfig, gtk3, glib { stdenv, fetchurl, fetchgit, vala_0_32, intltool, libgit2, pkgconfig, gtk3, glib
, json_glib, webkitgtk, makeWrapper, libpeas, bash, gobjectIntrospection , json_glib, webkitgtk, wrapGAppsHook, libpeas, bash, gobjectIntrospection
, gnome3, gtkspell3, shared_mime_info, libgee, libgit2-glib, librsvg, libsecret }: , gnome3, gtkspell3, shared_mime_info, libgee, libgit2-glib, librsvg, libsecret
, dconf}:
# TODO: icons and theme still does not work # TODO: icons and theme still does not work
# use packaged gnome3.adwaita-icon-theme # use packaged gnome3.adwaita-icon-theme
@ -20,19 +22,14 @@ stdenv.mkDerivation rec {
buildInputs = [ vala_0_32 intltool libgit2 pkgconfig gtk3 glib json_glib webkitgtk libgee libpeas buildInputs = [ vala_0_32 intltool libgit2 pkgconfig gtk3 glib json_glib webkitgtk libgee libpeas
libgit2-glib gtkspell3 gnome3.gsettings_desktop_schemas gnome3.gtksourceview libgit2-glib gtkspell3 gnome3.gsettings_desktop_schemas gnome3.gtksourceview
librsvg libsecret librsvg libsecret dconf
gobjectIntrospection makeWrapper gnome3.adwaita-icon-theme ]; gobjectIntrospection gnome3.adwaita-icon-theme ];
nativeBuildInputs = [ wrapGAppsHook ];
# https://bugzilla.gnome.org/show_bug.cgi?id=758240 # https://bugzilla.gnome.org/show_bug.cgi?id=758240
preBuild = ''make -j$NIX_BUILD_CORES Gitg-1.0.gir''; preBuild = ''make -j$NIX_BUILD_CORES Gitg-1.0.gir'';
preFixup = ''
wrapProgram "$out/bin/gitg" \
--prefix GI_TYPELIB_PATH : "$GI_TYPELIB_PATH" \
--set GDK_PIXBUF_MODULE_FILE "$GDK_PIXBUF_MODULE_FILE" \
--prefix XDG_DATA_DIRS : "$XDG_ICON_DIRS:${gtk3.out}/share:${gnome3.gnome_themes_standard}/share:$out/share:$GSETTINGS_SCHEMAS_PATH"
'';
meta = with stdenv.lib; { meta = with stdenv.lib; {
homepage = https://wiki.gnome.org/action/show/Apps/Gitg; homepage = https://wiki.gnome.org/action/show/Apps/Gitg;
description = "GNOME GUI client to view git repositories"; description = "GNOME GUI client to view git repositories";