pyrox.dev / nixpkgs
lol
fork atom

Merge pull request #16196 from RonnyPfannschmidt/wrapGAppsHook

Wrap g apps hook

authored by

Luca Bruno and committed by
GitHub 503b8cef 76bcd012

+7 -24
unified split
+2 -7
pkgs/desktops/gnome-3/3.18/core/gnome-disk-utility/default.nix
··· 1 1 { stdenv, intltool, fetchurl, pkgconfig, udisks2, libsecret, libdvdread 2 - , bash, gtk3, glib, makeWrapper, cracklib, libnotify 2 + , bash, gtk3, glib, wrapGAppsHook, cracklib, libnotify 3 3 , itstool, gnome3, librsvg, gdk_pixbuf, libxml2, python 4 4 , libcanberra_gtk3, libxslt, libtool, docbook_xsl, libpwquality }: 5 5 ··· 17 17 libnotify libdvdread libcanberra_gtk3 docbook_xsl 18 18 gdk_pixbuf gnome3.defaultIconTheme 19 19 librsvg udisks2 gnome3.gnome_settings_daemon 20 - gnome3.gsettings_desktop_schemas makeWrapper libxml2 ]; 20 + gnome3.gsettings_desktop_schemas wrapGAppsHook libxml2 ]; 21 21 22 - preFixup = '' 23 - wrapProgram "$out/bin/gnome-disks" \ 24 - --set GDK_PIXBUF_MODULE_FILE "$GDK_PIXBUF_MODULE_FILE" \ 25 - --prefix XDG_DATA_DIRS : "${gnome3.gnome_themes_standard}/share:$out/share:$XDG_ICON_DIRS:$GSETTINGS_SCHEMAS_PATH" 26 - ''; 27 22 28 23 meta = with stdenv.lib; { 29 24 homepage = http://en.wikipedia.org/wiki/GNOME_Disks;
+2 -9
pkgs/desktops/gnome-3/3.18/core/gnome-keyring/default.nix
··· 1 1 { stdenv, fetchurl, pkgconfig, dbus, libgcrypt, libtasn1, pam, python, glib, libxslt 2 - , intltool, pango, gcr, gdk_pixbuf, atk, p11_kit, makeWrapper 2 + , intltool, pango, gcr, gdk_pixbuf, atk, p11_kit, wrapGAppsHook 3 3 , docbook_xsl_ns, docbook_xsl, gnome3 }: 4 4 5 5 stdenv.mkDerivation rec { ··· 7 7 8 8 buildInputs = with gnome3; [ 9 9 dbus libgcrypt pam python gtk3 gconf libgnome_keyring 10 - pango gcr gdk_pixbuf atk p11_kit makeWrapper 10 + pango gcr gdk_pixbuf atk p11_kit wrapGAppsHook 11 11 ]; 12 12 13 13 propagatedBuildInputs = [ glib libtasn1 libxslt ]; ··· 18 18 "--with-pkcs11-config=$$out/etc/pkcs11/" # installation directories 19 19 "--with-pkcs11-modules=$$out/lib/pkcs11/" 20 20 ]; 21 - 22 - preFixup = '' 23 - wrapProgram "$out/bin/gnome-keyring" \ 24 - --prefix XDG_DATA_DIRS : "${glib}/share:$out/share:$GSETTINGS_SCHEMAS_PATH" 25 - wrapProgram "$out/bin/gnome-keyring-daemon" \ 26 - --prefix XDG_DATA_DIRS : "${glib}/share:$out/share:$GSETTINGS_SCHEMAS_PATH" 27 - ''; 28 21 29 22 meta = with stdenv.lib; { 30 23 platforms = platforms.linux;
+3 -8
pkgs/desktops/gnome-3/3.18/core/gnome-online-accounts/default.nix
··· 1 1 { stdenv, fetchurl, pkgconfig, glib, libxslt, gtk, makeWrapper 2 2 , webkitgtk, json_glib, rest, libsecret, dbus_glib, gnome_common 3 3 , telepathy_glib, intltool, dbus_libs, icu, autoreconfHook 4 - , libsoup, docbook_xsl_ns, docbook_xsl, gnome3 4 + , libsoup, docbook_xsl_ns, docbook_xsl, gnome3, wrapGAppsHook 5 5 }: 6 6 7 7 stdenv.mkDerivation rec { ··· 16 16 sed "/if HAVE_INTROSPECTION/a INTROSPECTION_COMPILER_ARGS = --shared-library=$out/lib/libgoa-1.0.so" -i src/goa/Makefile.am 17 17 ''; 18 18 19 - buildInputs = [ pkgconfig glib libxslt gtk webkitgtk json_glib rest gnome_common makeWrapper 19 + buildInputs = [ pkgconfig glib libxslt gtk webkitgtk json_glib rest gnome_common wrapGAppsHook 20 20 libsecret dbus_glib telepathy_glib intltool icu libsoup autoreconfHook 21 - docbook_xsl_ns docbook_xsl gnome3.defaultIconTheme ]; 21 + docbook_xsl_ns docbook_xsl gnome3.defaultIconTheme ]; 22 22 23 - preFixup = '' 24 - for f in "$out/libexec/"*; do 25 - wrapProgram "$f" --prefix XDG_DATA_DIRS : "$GSETTINGS_SCHEMAS_PATH" 26 - done 27 - ''; 28 23 29 24 meta = with stdenv.lib; { 30 25 platforms = platforms.linux;