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

Merge pull request #16196 from RonnyPfannschmidt/wrapGAppsHook 

Wrap g apps hook
This commit is contained in:
Luca Bruno 2016-07-24 11:49:59 +01:00 committed by GitHub
parent 76bcd012a5 be7043e01a
commit 503b8cef62
3 changed files with 7 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
pkgs/desktops/gnome-3/3.18/core/gnome-disk-utility/default.nix
View File

@ -1,5 +1,5 @@
{ stdenv, intltool, fetchurl, pkgconfig, udisks2, libsecret, libdvdread { stdenv, intltool, fetchurl, pkgconfig, udisks2, libsecret, libdvdread
, bash, gtk3, glib, makeWrapper, cracklib, libnotify , bash, gtk3, glib, wrapGAppsHook, cracklib, libnotify
, itstool, gnome3, librsvg, gdk_pixbuf, libxml2, python , itstool, gnome3, librsvg, gdk_pixbuf, libxml2, python
, libcanberra_gtk3, libxslt, libtool, docbook_xsl, libpwquality }: , libcanberra_gtk3, libxslt, libtool, docbook_xsl, libpwquality }:
@ -17,13 +17,8 @@ stdenv.mkDerivation rec {
libnotify libdvdread libcanberra_gtk3 docbook_xsl libnotify libdvdread libcanberra_gtk3 docbook_xsl
gdk_pixbuf gnome3.defaultIconTheme gdk_pixbuf gnome3.defaultIconTheme
librsvg udisks2 gnome3.gnome_settings_daemon librsvg udisks2 gnome3.gnome_settings_daemon
gnome3.gsettings_desktop_schemas makeWrapper libxml2 ]; gnome3.gsettings_desktop_schemas wrapGAppsHook libxml2 ];
preFixup = ''
wrapProgram "$out/bin/gnome-disks" \
--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 = http://en.wikipedia.org/wiki/GNOME_Disks; homepage = http://en.wikipedia.org/wiki/GNOME_Disks;

11
pkgs/desktops/gnome-3/3.18/core/gnome-keyring/default.nix
View File

@ -1,5 +1,5 @@
{ stdenv, fetchurl, pkgconfig, dbus, libgcrypt, libtasn1, pam, python, glib, libxslt { stdenv, fetchurl, pkgconfig, dbus, libgcrypt, libtasn1, pam, python, glib, libxslt
, intltool, pango, gcr, gdk_pixbuf, atk, p11_kit, makeWrapper , intltool, pango, gcr, gdk_pixbuf, atk, p11_kit, wrapGAppsHook
, docbook_xsl_ns, docbook_xsl, gnome3 }: , docbook_xsl_ns, docbook_xsl, gnome3 }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
@ -7,7 +7,7 @@ stdenv.mkDerivation rec {
buildInputs = with gnome3; [ buildInputs = with gnome3; [
dbus libgcrypt pam python gtk3 gconf libgnome_keyring dbus libgcrypt pam python gtk3 gconf libgnome_keyring
pango gcr gdk_pixbuf atk p11_kit makeWrapper pango gcr gdk_pixbuf atk p11_kit wrapGAppsHook
]; ];
propagatedBuildInputs = [ glib libtasn1 libxslt ]; propagatedBuildInputs = [ glib libtasn1 libxslt ];
@ -19,13 +19,6 @@ stdenv.mkDerivation rec {
"--with-pkcs11-modules=$$out/lib/pkcs11/" "--with-pkcs11-modules=$$out/lib/pkcs11/"
]; ];
preFixup = ''
wrapProgram "$out/bin/gnome-keyring" \
--prefix XDG_DATA_DIRS : "${glib}/share:$out/share:$GSETTINGS_SCHEMAS_PATH"
wrapProgram "$out/bin/gnome-keyring-daemon" \
--prefix XDG_DATA_DIRS : "${glib}/share:$out/share:$GSETTINGS_SCHEMAS_PATH"
'';
meta = with stdenv.lib; { meta = with stdenv.lib; {
platforms = platforms.linux; platforms = platforms.linux;
maintainers = gnome3.maintainers; maintainers = gnome3.maintainers;

11
pkgs/desktops/gnome-3/3.18/core/gnome-online-accounts/default.nix
View File

@ -1,7 +1,7 @@
{ stdenv, fetchurl, pkgconfig, glib, libxslt, gtk, makeWrapper { stdenv, fetchurl, pkgconfig, glib, libxslt, gtk, makeWrapper
, webkitgtk, json_glib, rest, libsecret, dbus_glib, gnome_common , webkitgtk, json_glib, rest, libsecret, dbus_glib, gnome_common
, telepathy_glib, intltool, dbus_libs, icu, autoreconfHook , telepathy_glib, intltool, dbus_libs, icu, autoreconfHook
, libsoup, docbook_xsl_ns, docbook_xsl, gnome3 , libsoup, docbook_xsl_ns, docbook_xsl, gnome3, wrapGAppsHook
}: }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
@ -16,15 +16,10 @@ stdenv.mkDerivation rec {
sed "/if HAVE_INTROSPECTION/a INTROSPECTION_COMPILER_ARGS = --shared-library=$out/lib/libgoa-1.0.so" -i src/goa/Makefile.am sed "/if HAVE_INTROSPECTION/a INTROSPECTION_COMPILER_ARGS = --shared-library=$out/lib/libgoa-1.0.so" -i src/goa/Makefile.am
''; '';
buildInputs = [ pkgconfig glib libxslt gtk webkitgtk json_glib rest gnome_common makeWrapper buildInputs = [ pkgconfig glib libxslt gtk webkitgtk json_glib rest gnome_common wrapGAppsHook
libsecret dbus_glib telepathy_glib intltool icu libsoup autoreconfHook libsecret dbus_glib telepathy_glib intltool icu libsoup autoreconfHook
docbook_xsl_ns docbook_xsl gnome3.defaultIconTheme ]; docbook_xsl_ns docbook_xsl gnome3.defaultIconTheme ];
preFixup = ''
for f in "$out/libexec/"*; do
wrapProgram "$f" --prefix XDG_DATA_DIRS : "$GSETTINGS_SCHEMAS_PATH"
done
'';
meta = with stdenv.lib; { meta = with stdenv.lib; {
platforms = platforms.linux; platforms = platforms.linux;