mirrors/nixpkgs
1
0
Fork 1
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-11-27 16:11:58 +00:00
Code Issues Wiki Activity

Merge pull request #14121 from romildo/fix.gnome

Browse source 
Use wrapGAppsHook to wrap environment variables in some gnome3 applications
This commit is contained in:
Luca Bruno 2016-03-22 20:15:17 +01:00
parent f881bb06b1 5b642fb8db
commit b6aa08878d
8 changed files with 39 additions and 78 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
pkgs/desktops/gnome-3/3.18/apps/file-roller/default.nix
View file

@ -1,5 +1,5 @@
{ stdenv, fetchurl, glib, pkgconfig, gnome3, intltool, itstool, libxml2, libarchive { stdenv, fetchurl, glib, pkgconfig, gnome3, intltool, itstool, libxml2, libarchive
, attr, bzip2, acl, makeWrapper, librsvg, gdk_pixbuf }: , attr, bzip2, acl, wrapGAppsHook, librsvg, gdk_pixbuf }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
inherit (import ./src.nix fetchurl) name src; inherit (import ./src.nix fetchurl) name src;
@ -7,14 +7,11 @@ stdenv.mkDerivation rec {
# TODO: support nautilus # TODO: support nautilus
# it tries to create {nautilus}/lib/nautilus/extensions-3.0/libnautilus-fileroller.so # it tries to create {nautilus}/lib/nautilus/extensions-3.0/libnautilus-fileroller.so
buildInputs = [ glib pkgconfig gnome3.gtk intltool itstool libxml2 libarchive nativeBuildInputs = [ pkgconfig wrapGAppsHook ];
gnome3.defaultIconTheme attr bzip2 acl gdk_pixbuf librsvg
makeWrapper ];
preFixup = '' buildInputs = [ glib gnome3.gtk intltool itstool libxml2 libarchive
wrapProgram "$out/bin/file-roller" \ gnome3.defaultIconTheme attr bzip2 acl gdk_pixbuf librsvg
--prefix XDG_DATA_DIRS : "$XDG_ICON_DIRS:$GSETTINGS_SCHEMAS_PATH:$out/share" gnome3.dconf ];
'';
meta = with stdenv.lib; { meta = with stdenv.lib; {
homepage = https://wiki.gnome.org/Apps/FileRoller; homepage = https://wiki.gnome.org/Apps/FileRoller;

14
pkgs/desktops/gnome-3/3.18/apps/gedit/default.nix
View file

@ -1,6 +1,6 @@
{ stdenv, intltool, fetchurl, enchant, isocodes { stdenv, intltool, fetchurl, enchant, isocodes
, pkgconfig, gtk3, glib , pkgconfig, gtk3, glib
, bash, makeWrapper, itstool, libsoup, libxml2 , bash, wrapGAppsHook, itstool, libsoup, libxml2
, gnome3, librsvg, gdk_pixbuf, file }: , gnome3, librsvg, gdk_pixbuf, file }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
@ -8,19 +8,17 @@ stdenv.mkDerivation rec {
propagatedUserEnvPkgs = [ gnome3.gnome_themes_standard ]; propagatedUserEnvPkgs = [ gnome3.gnome_themes_standard ];
buildInputs = [ pkgconfig gtk3 glib intltool itstool enchant isocodes nativeBuildInputs = [ pkgconfig wrapGAppsHook ];
buildInputs = [ gtk3 glib intltool itstool enchant isocodes
gdk_pixbuf gnome3.defaultIconTheme librsvg libsoup gdk_pixbuf gnome3.defaultIconTheme librsvg libsoup
gnome3.libpeas gnome3.gtksourceview libxml2 gnome3.libpeas gnome3.gtksourceview libxml2
gnome3.gsettings_desktop_schemas makeWrapper file ]; gnome3.gsettings_desktop_schemas gnome3.dconf file ];
enableParallelBuilding = true; enableParallelBuilding = true;
preFixup = '' preFixup = ''
wrapProgram "$out/bin/gedit" \ gappsWrapperArgs+=(--prefix LD_LIBRARY_PATH : "${gnome3.libpeas}/lib:${gnome3.gtksourceview}/lib")
--set GDK_PIXBUF_MODULE_FILE "$GDK_PIXBUF_MODULE_FILE" \
--prefix GI_TYPELIB_PATH : "$GI_TYPELIB_PATH" \
--prefix LD_LIBRARY_PATH : "${gnome3.libpeas}/lib:${gnome3.gtksourceview}/lib" \
--prefix XDG_DATA_DIRS : "${gnome3.gnome_themes_standard}/share:$XDG_ICON_DIRS:$GSETTINGS_SCHEMAS_PATH"
''; '';
meta = with stdenv.lib; { meta = with stdenv.lib; {

11
pkgs/desktops/gnome-3/3.18/core/dconf-editor/default.nix
View file

@ -1,16 +1,13 @@
{ stdenv, fetchurl, vala, libxslt, pkgconfig, glib, dbus_glib, gnome3 { stdenv, fetchurl, vala, libxslt, pkgconfig, glib, dbus_glib, gnome3
, libxml2, intltool, docbook_xsl_ns, docbook_xsl, makeWrapper }: , libxml2, intltool, docbook_xsl_ns, docbook_xsl, wrapGAppsHook }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
inherit (import ./src.nix fetchurl) name src; inherit (import ./src.nix fetchurl) name src;
buildInputs = [ vala libxslt pkgconfig glib dbus_glib gnome3.gtk libxml2 gnome3.defaultIconTheme nativeBuildInputs = [ pkgconfig wrapGAppsHook ];
intltool docbook_xsl docbook_xsl_ns makeWrapper gnome3.dconf ];
preFixup = '' buildInputs = [ vala libxslt glib dbus_glib gnome3.gtk libxml2 gnome3.defaultIconTheme
wrapProgram "$out/bin/dconf-editor" \ intltool docbook_xsl docbook_xsl_ns gnome3.dconf ];
--prefix XDG_DATA_DIRS : "$XDG_ICON_DIRS:$GSETTINGS_SCHEMAS_PATH"
'';
meta = with stdenv.lib; { meta = with stdenv.lib; {
platforms = platforms.linux; platforms = platforms.linux;

17
pkgs/desktops/gnome-3/3.18/core/eog/default.nix
View file

@ -1,20 +1,15 @@
{ fetchurl, stdenv, intltool, pkgconfig, itstool, libxml2, libjpeg, gnome3 { fetchurl, stdenv, intltool, pkgconfig, itstool, libxml2, libjpeg, gnome3
, shared_mime_info, makeWrapper, librsvg, libexif }: , shared_mime_info, wrapGAppsHook, librsvg, libexif }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
inherit (import ./src.nix fetchurl) name src; inherit (import ./src.nix fetchurl) name src;
nativeBuildInputs = [ pkgconfig wrapGAppsHook ];
buildInputs = with gnome3; buildInputs = with gnome3;
[ intltool pkgconfig itstool libxml2 libjpeg gtk glib libpeas makeWrapper librsvg [ intltool itstool libxml2 libjpeg gtk glib libpeas librsvg
gsettings_desktop_schemas shared_mime_info adwaita-icon-theme gnome_desktop libexif ]; gsettings_desktop_schemas shared_mime_info adwaita-icon-theme
gnome_desktop libexif dconf ];
preFixup = ''
wrapProgram "$out/bin/eog" \
--prefix GI_TYPELIB_PATH : "$GI_TYPELIB_PATH" \
--set GDK_PIXBUF_MODULE_FILE "$GDK_PIXBUF_MODULE_FILE" \
--prefix XDG_DATA_DIRS : "$XDG_ICON_DIRS:${shared_mime_info}/share:${gnome3.adwaita-icon-theme}/share:${gnome3.gtk}/share:$out/share:$GSETTINGS_SCHEMAS_PATH"
'';
meta = with stdenv.lib; { meta = with stdenv.lib; {
homepage = https://wiki.gnome.org/Apps/EyeOfGnome; homepage = https://wiki.gnome.org/Apps/EyeOfGnome;

15
pkgs/desktops/gnome-3/3.18/core/epiphany/default.nix
View file

@ -1,5 +1,5 @@
{ stdenv, intltool, fetchurl, pkgconfig, gtk3, glib, nspr, icu { stdenv, intltool, fetchurl, pkgconfig, gtk3, glib, nspr, icu
, bash, makeWrapper, gnome3, libwnck3, libxml2, libxslt, libtool , bash, wrapGAppsHook, gnome3, libwnck3, libxml2, libxslt, libtool
, webkitgtk, libsoup, glib_networking, libsecret, gnome_desktop, libnotify, p11_kit , webkitgtk, libsoup, glib_networking, libsecret, gnome_desktop, libnotify, p11_kit
, sqlite, gcr, avahi, nss, isocodes, itstool, file, which , sqlite, gcr, avahi, nss, isocodes, itstool, file, which
, gdk_pixbuf, librsvg, gnome_common }: , gdk_pixbuf, librsvg, gnome_common }:
@ -12,27 +12,18 @@ stdenv.mkDerivation rec {
propagatedUserEnvPkgs = [ gnome3.gnome_themes_standard ]; propagatedUserEnvPkgs = [ gnome3.gnome_themes_standard ];
nativeBuildInputs = [ pkgconfig file ]; nativeBuildInputs = [ pkgconfig file wrapGAppsHook ];
buildInputs = [ gtk3 glib intltool libwnck3 libxml2 libxslt pkgconfig file buildInputs = [ gtk3 glib intltool libwnck3 libxml2 libxslt pkgconfig file
webkitgtk libsoup libsecret gnome_desktop libnotify libtool webkitgtk libsoup libsecret gnome_desktop libnotify libtool
sqlite isocodes nss itstool p11_kit nspr icu gnome3.yelp_tools sqlite isocodes nss itstool p11_kit nspr icu gnome3.yelp_tools
gdk_pixbuf gnome3.defaultIconTheme librsvg which gnome_common gdk_pixbuf gnome3.defaultIconTheme librsvg which gnome_common
gcr avahi gnome3.gsettings_desktop_schemas makeWrapper ]; gcr avahi gnome3.gsettings_desktop_schemas gnome3.dconf ];
NIX_CFLAGS_COMPILE = "-I${nspr}/include/nspr -I${nss}/include/nss -I${glib}/include/gio-unix-2.0"; NIX_CFLAGS_COMPILE = "-I${nspr}/include/nspr -I${nss}/include/nss -I${glib}/include/gio-unix-2.0";
enableParallelBuilding = true; enableParallelBuilding = true;
preFixup = ''
for f in $out/bin/* $out/libexec/*; do
wrapProgram "$f" \
--set GDK_PIXBUF_MODULE_FILE "$GDK_PIXBUF_MODULE_FILE" \
--prefix GIO_EXTRA_MODULES : "${glib_networking}/lib/gio/modules" \
--prefix XDG_DATA_DIRS : "${gnome3.gnome_themes_standard}/share:$out/share:$XDG_ICON_DIRS:$GSETTINGS_SCHEMAS_PATH"
done
'';
meta = with stdenv.lib; { meta = with stdenv.lib; {
homepage = https://wiki.gnome.org/Apps/Epiphany; homepage = https://wiki.gnome.org/Apps/Epiphany;
description = "WebKit based web browser for GNOME"; description = "WebKit based web browser for GNOME";

17
pkgs/desktops/gnome-3/3.18/core/evince/default.nix
View file

@ -1,6 +1,6 @@
{ fetchurl, stdenv, pkgconfig, intltool, perl, perlXMLParser, libxml2 { fetchurl, stdenv, pkgconfig, intltool, perl, perlXMLParser, libxml2
, glib, gtk3, pango, atk, gdk_pixbuf, shared_mime_info, itstool, gnome3 , glib, gtk3, pango, atk, gdk_pixbuf, shared_mime_info, itstool, gnome3
, poppler, ghostscriptX, djvulibre, libspectre, libsecret , makeWrapper , poppler, ghostscriptX, djvulibre, libspectre, libsecret , wrapGAppsHook
, librsvg, gobjectIntrospection , librsvg, gobjectIntrospection
, recentListSize ? null # 5 is not enough, allow passing a different number , recentListSize ? null # 5 is not enough, allow passing a different number
, supportXPS ? false # Open XML Paper Specification via libgxps , supportXPS ? false # Open XML Paper Specification via libgxps
@ -9,13 +9,15 @@
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
inherit (import ./src.nix fetchurl) name src; inherit (import ./src.nix fetchurl) name src;
nativeBuildInputs = [ pkgconfig wrapGAppsHook ];
buildInputs = [ buildInputs = [
pkgconfig intltool perl perlXMLParser libxml2 intltool perl perlXMLParser libxml2
glib gtk3 pango atk gdk_pixbuf gobjectIntrospection glib gtk3 pango atk gdk_pixbuf gobjectIntrospection
itstool gnome3.adwaita-icon-theme itstool gnome3.adwaita-icon-theme
gnome3.libgnome_keyring gnome3.gsettings_desktop_schemas gnome3.libgnome_keyring gnome3.gsettings_desktop_schemas
poppler ghostscriptX djvulibre libspectre poppler ghostscriptX djvulibre libspectre
makeWrapper libsecret librsvg gnome3.adwaita-icon-theme libsecret librsvg gnome3.adwaita-icon-theme gnome3.dconf
] ++ stdenv.lib.optional supportXPS gnome3.libgxps; ] ++ stdenv.lib.optional supportXPS gnome3.libgxps;
configureFlags = [ configureFlags = [
@ -37,15 +39,6 @@ stdenv.mkDerivation rec {
sed -i 's/\(if (++n_items == \)5\(.*\)/\1${builtins.toString recentListSize}\2/' shell/ev-window.c sed -i 's/\(if (++n_items == \)5\(.*\)/\1${builtins.toString recentListSize}\2/' shell/ev-window.c
''; '';
preFixup = ''
# Tell Glib/GIO about the MIME info directory, which is used
# by `g_file_info_get_content_type ()'.
wrapProgram "$out/bin/evince" \
--set GDK_PIXBUF_MODULE_FILE "$GDK_PIXBUF_MODULE_FILE" \
--prefix XDG_DATA_DIRS : "$XDG_ICON_DIRS:${gtk3}/share:${shared_mime_info}/share:$out/share:$GSETTINGS_SCHEMAS_PATH"
'';
doCheck = false; # would need pythonPackages.dogTail, which is missing doCheck = false; # would need pythonPackages.dogTail, which is missing
meta = with stdenv.lib; { meta = with stdenv.lib; {

14
pkgs/desktops/gnome-3/3.18/core/gnome-calculator/default.nix
View file

@ -1,5 +1,5 @@
{ stdenv, intltool, fetchurl, pkgconfig, libxml2 { stdenv, intltool, fetchurl, pkgconfig, libxml2
, bash, gtk3, glib, makeWrapper , bash, gtk3, glib, wrapGAppsHook
, itstool, gnome3, librsvg, gdk_pixbuf, mpfr, gmp }: , itstool, gnome3, librsvg, gdk_pixbuf, mpfr, gmp }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
@ -9,16 +9,12 @@ stdenv.mkDerivation rec {
propagatedUserEnvPkgs = [ gnome3.gnome_themes_standard ]; propagatedUserEnvPkgs = [ gnome3.gnome_themes_standard ];
buildInputs = [ bash pkgconfig gtk3 glib intltool itstool nativeBuildInputs = [ pkgconfig wrapGAppsHook ];
buildInputs = [ bash gtk3 glib intltool itstool
libxml2 gnome3.gtksourceview mpfr gmp libxml2 gnome3.gtksourceview mpfr gmp
gdk_pixbuf gnome3.defaultIconTheme librsvg gdk_pixbuf gnome3.defaultIconTheme librsvg
gnome3.gsettings_desktop_schemas makeWrapper ]; gnome3.gsettings_desktop_schemas gnome3.dconf ];
preFixup = ''
wrapProgram "$out/bin/gnome-calculator" \
--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"
'';
meta = with stdenv.lib; { meta = with stdenv.lib; {
homepage = https://wiki.gnome.org/action/show/Apps/Calculator; homepage = https://wiki.gnome.org/action/show/Apps/Calculator;

16
pkgs/desktops/gnome-3/3.18/core/nautilus/default.nix
View file

@ -1,21 +1,15 @@
{ stdenv, fetchurl, pkgconfig, libxml2, dbus_glib, shared_mime_info, libexif { stdenv, fetchurl, pkgconfig, libxml2, dbus_glib, shared_mime_info, libexif
, gtk, gnome3, libunique, intltool, gobjectIntrospection , gtk, gnome3, libunique, intltool, gobjectIntrospection
, libnotify, makeWrapper, exempi, librsvg, tracker }: , libnotify, wrapGAppsHook, exempi, librsvg, tracker }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
inherit (import ./src.nix fetchurl) name src; inherit (import ./src.nix fetchurl) name src;
buildInputs = [ pkgconfig libxml2 dbus_glib shared_mime_info libexif gtk libunique intltool exempi librsvg nativeBuildInputs = [ pkgconfig wrapGAppsHook ];
gnome3.gnome_desktop gnome3.adwaita-icon-theme
gnome3.gsettings_desktop_schemas libnotify makeWrapper tracker ];
preFixup = '' buildInputs = [ libxml2 dbus_glib shared_mime_info libexif gtk libunique intltool exempi librsvg
wrapProgram "$out/bin/nautilus" \ gnome3.gnome_desktop gnome3.adwaita-icon-theme
--prefix GI_TYPELIB_PATH : "$GI_TYPELIB_PATH" \ gnome3.gsettings_desktop_schemas gnome3.dconf libnotify tracker ];
--set GDK_PIXBUF_MODULE_FILE "$GDK_PIXBUF_MODULE_FILE" \
--prefix XDG_DATA_DIRS : "$XDG_ICON_DIRS:$out/share" \
--suffix XDG_DATA_DIRS : "$GSETTINGS_SCHEMAS_PATH"
'';
patches = [ ./extension_dir.patch ]; patches = [ ./extension_dir.patch ];