diff options
| author | Benjamin Herr <ben@0x539.de> | 2016-08-28 09:55:51 +0200 |
|---|---|---|
| committer | Robin Gloster <mail@glob.in> | 2016-08-28 07:55:51 +0000 |
| commit | dbae71570f12fe6d63976921b5a61aa3a6b0bda1 (patch) | |
| tree | f9a4d1250afc82e08805243640dfa5ea7ed725bc /pkgs | |
| parent | 33638ca99e891cd046598ab440d0a60fa231262c (diff) | |
| download | nixlib-dbae71570f12fe6d63976921b5a61aa3a6b0bda1.tar nixlib-dbae71570f12fe6d63976921b5a61aa3a6b0bda1.tar.gz nixlib-dbae71570f12fe6d63976921b5a61aa3a6b0bda1.tar.bz2 nixlib-dbae71570f12fe6d63976921b5a61aa3a6b0bda1.tar.lz nixlib-dbae71570f12fe6d63976921b5a61aa3a6b0bda1.tar.xz nixlib-dbae71570f12fe6d63976921b5a61aa3a6b0bda1.tar.zst nixlib-dbae71570f12fe6d63976921b5a61aa3a6b0bda1.zip | |
gitg: use wrapGAppsHook, pull in dconf (#18040)
Without dconf, gitg doesn't remember preferences such as window size.
Diffstat (limited to 'pkgs')
| -rw-r--r-- | pkgs/desktops/gnome-3/3.20/misc/gitg/default.nix | 19 |
1 files changed, 8 insertions, 11 deletions
diff --git a/pkgs/desktops/gnome-3/3.20/misc/gitg/default.nix b/pkgs/desktops/gnome-3/3.20/misc/gitg/default.nix index e98c2ae8e579..27d5bc91b9f3 100644 --- a/pkgs/desktops/gnome-3/3.20/misc/gitg/default.nix +++ b/pkgs/desktops/gnome-3/3.20/misc/gitg/default.nix @@ -1,6 +1,8 @@ { stdenv, fetchurl, fetchgit, vala_0_32, intltool, libgit2, pkgconfig, gtk3, glib -, json_glib, webkitgtk, makeWrapper, libpeas, bash, gobjectIntrospection -, gnome3, gtkspell3, shared_mime_info, libgee, libgit2-glib, librsvg, libsecret }: +, json_glib, webkitgtk, wrapGAppsHook, libpeas, bash, gobjectIntrospection +, gnome3, gtkspell3, shared_mime_info, libgee, libgit2-glib, librsvg, libsecret +, dconf}: + # TODO: icons and theme still does not work # 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 libgit2-glib gtkspell3 gnome3.gsettings_desktop_schemas gnome3.gtksourceview - librsvg libsecret - gobjectIntrospection makeWrapper gnome3.adwaita-icon-theme ]; + librsvg libsecret dconf + gobjectIntrospection gnome3.adwaita-icon-theme ]; + + nativeBuildInputs = [ wrapGAppsHook ]; # https://bugzilla.gnome.org/show_bug.cgi?id=758240 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; { homepage = https://wiki.gnome.org/action/show/Apps/Gitg; description = "GNOME GUI client to view git repositories"; |