Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 4e47390bce0b
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 2b4bc03969ca
Choose a head ref
  • 2 commits
  • 2 files changed
  • 1 contributor

Commits on Jul 13, 2017

  1. gnome-control-center: wrap with wrapGAppsHook

    @globin
    Stefan Lau authored and globin committed Jul 13, 2017

    Verified

    This commit was signed with the committer’s verified signature.
    slawekjaranowski Slawomir Jaranowski
    GPG key ID: 9EB80E92EB2135B1
    Verified
    Learn about vigilant mode
    Copy the full SHA
    8ff35d6 View commit details

  2. gnome-online-accounts: wrap with wrapGAppsHook

    @globin
    Stefan Lau authored and globin committed Jul 13, 2017
    Copy the full SHA
    2b4bc03 View commit details
Showing with 7 additions and 16 deletions.
  1. +3 −6 pkgs/desktops/gnome-3/3.22/core/gnome-control-center/default.nix
  2. +4 −10 pkgs/desktops/gnome-3/3.22/core/gnome-online-accounts/default.nix
9 changes: 3 additions & 6 deletions pkgs/desktops/gnome-3/3.22/core/gnome-control-center/default.nix
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
{ fetchurl, stdenv, pkgconfig, gnome3, ibus, intltool, upower, makeWrapper
{ fetchurl, stdenv, pkgconfig, gnome3, ibus, intltool, upower, wrapGAppsHook
, libcanberra_gtk2, libcanberra_gtk3, accountsservice, libpwquality, libpulseaudio
, gdk_pixbuf, librsvg, libxkbfile, libnotify, libgudev
, libxml2, polkit, libxslt, libgtop, libsoup, colord, colord-gtk
@@ -20,13 +20,13 @@ stdenv.mkDerivation rec {
enableParallelBuilding = false;

buildInputs = with gnome3;
[ pkgconfig intltool ibus gtk glib upower libcanberra_gtk2 gsettings_desktop_schemas
[ pkgconfig intltool ibus gtk glib glib_networking upower libcanberra_gtk2 gsettings_desktop_schemas
libxml2 gnome_desktop gnome_settings_daemon polkit libxslt libgtop gnome-menus
gnome_online_accounts libsoup colord libpulseaudio fontconfig colord-gtk libpwquality
accountsservice libkrb5 networkmanagerapplet libwacom samba libnotify libxkbfile
shared_mime_info icu libtool docbook_xsl docbook_xsl_ns gnome3.grilo
gdk_pixbuf gnome3.defaultIconTheme librsvg clutter clutter_gtk
gnome3.vino udev libcanberra_gtk3 libgudev
gnome3.vino udev libcanberra_gtk3 libgudev wrapGAppsHook
networkmanager modemmanager makeWrapper gnome3.gnome-bluetooth grilo tracker
cracklib ];

@@ -39,9 +39,6 @@ stdenv.mkDerivation rec {
'';

preFixup = with gnome3; ''
wrapProgram $out/bin/gnome-control-center \
--set GDK_PIXBUF_MODULE_FILE "$GDK_PIXBUF_MODULE_FILE" \
--prefix XDG_DATA_DIRS : "${gnome3.gnome_themes_standard}/share:${sound-theme-freedesktop}/share:$out/share:$out/share/gnome-control-center:$XDG_ICON_DIRS:$GSETTINGS_SCHEMAS_PATH"
for i in $out/share/applications/*; do
substituteInPlace $i --replace "gnome-control-center" "$out/bin/gnome-control-center"
done
14 changes: 4 additions & 10 deletions pkgs/desktops/gnome-3/3.22/core/gnome-online-accounts/default.nix
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{ stdenv, fetchurl, pkgconfig, glib, libxslt, gtk, makeWrapper
{ stdenv, fetchurl, pkgconfig, glib, libxslt, gtk, wrapGAppsHook
, webkitgtk, json_glib, rest, libsecret, dbus_glib, gnome_common
, telepathy_glib, intltool, dbus_libs, icu
, telepathy_glib, intltool, dbus_libs, icu, glib_networking
, libsoup, docbook_xsl_ns, docbook_xsl, gnome3
}:

@@ -11,16 +11,10 @@ stdenv.mkDerivation rec {

enableParallelBuilding = true;

buildInputs = [ pkgconfig glib libxslt gtk webkitgtk json_glib rest gnome_common makeWrapper
libsecret dbus_glib telepathy_glib intltool icu libsoup
buildInputs = [ pkgconfig glib libxslt gtk webkitgtk json_glib rest gnome_common wrapGAppsHook
libsecret dbus_glib telepathy_glib glib_networking intltool icu libsoup
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; {
platforms = platforms.linux;
maintainers = gnome3.maintainers;