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: 0f395d6faea1
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: e075227b00d0
Choose a head ref
  • 4 commits
  • 2 files changed
  • 2 contributors

Commits on Aug 24, 2019

  1. nixos/gnome3: fix default background setting 

    Fix the following error when opening Background panel in GNOME Settings:

    URI '/nix/store/…-simple-dark-gray-2016-02-19/share/artwork/gnome/nix-wallpaper-simple-dark-gray.png' is invalid
    @jtojnar
    jtojnar committed Aug 24, 2019
    Copy the full SHA
    305cb5c View commit details

  2. gnome3.gnome-control-center: format with nixpkgs-fmt

    @jtojnar
    jtojnar committed Aug 24, 2019
    Copy the full SHA
    040a09a View commit details

  3. gnome3.gnome-control-center: add grilo-plugins 

    Opening a background change dialogue produces the following errors in the console:

    (gnome-control-center:27270): Grilo-WARNING **: 21:57:21.349: [registry] ../src/grl-registry.c:1354: Could not open directory '/nix/store/q8wdbr08617p3xqxdg8935p31fha020f-grilo-0.3.9/lib/grilo-0.3': Error opening directory “/nix/store/q8wdbr08617p3xqxdg8935p31fha020f-grilo-0.3.9/lib/grilo-0.3”: No such file or directory
    (gnome-control-center:27270): Grilo-WARNING **: 21:57:21.352: [registry] ../src/grl-registry.c:1461: Plugin 'grl-flickr' not available
    (gnome-control-center:27270): background-cc-panel-WARNING **: 21:57:21.352: Plugin “grl-flickr” not available

Apparently, there are no plugins in `grilo` package – everything is in `grilo-plugins`, so we need to add `grilo-plugins` to inputs. The setup hook will make the plug-ins available through an environment variable:

https://gitlab.gnome.org/GNOME/grilo/blob/grilo-0.3.9/src/grilo.c#L111-135
    @jtojnar
    jtojnar committed Aug 24, 2019
    Copy the full SHA
    87e1643 View commit details

  4. Merge pull request #67407 from jtojnar/gnome-bg 

    nixos/gnome3: fix default background setting
    @worldofpeace
    worldofpeace authored Aug 24, 2019
    Copy the full SHA
    e075227 View commit details
Showing with 117 additions and 24 deletions.
  1. +2 −2 nixos/modules/services/x11/desktop-managers/gnome3.nix
  2. +115 −22 pkgs/desktops/gnome-3/core/gnome-control-center/default.nix
4 changes: 2 additions & 2 deletions nixos/modules/services/x11/desktop-managers/gnome3.nix
View file
Original file line number Diff line number Diff line change
@@ -29,10 +29,10 @@ let
chmod -R a+w $out/share/gsettings-schemas/nixos-gsettings-overrides
cat - > $out/share/gsettings-schemas/nixos-gsettings-overrides/glib-2.0/schemas/nixos-defaults.gschema.override <<- EOF
[org.gnome.desktop.background]
picture-uri='${pkgs.nixos-artwork.wallpapers.simple-dark-gray}/share/artwork/gnome/nix-wallpaper-simple-dark-gray.png'
picture-uri='file://${pkgs.nixos-artwork.wallpapers.simple-dark-gray}/share/artwork/gnome/nix-wallpaper-simple-dark-gray.png'
[org.gnome.desktop.screensaver]
picture-uri='${pkgs.nixos-artwork.wallpapers.simple-dark-gray-bottom}/share/artwork/gnome/nix-wallpaper-simple-dark-gray_bottom.png'
picture-uri='file://${pkgs.nixos-artwork.wallpapers.simple-dark-gray-bottom}/share/artwork/gnome/nix-wallpaper-simple-dark-gray_bottom.png'
[org.gnome.shell]
favorite-apps=[ 'org.gnome.Epiphany.desktop', 'evolution.desktop', 'org.gnome.Music.desktop', 'org.gnome.Photos.desktop', 'org.gnome.Nautilus.desktop', 'org.gnome.Software.desktop' ]
137 changes: 115 additions & 22 deletions pkgs/desktops/gnome-3/core/gnome-control-center/default.nix
View file
Original file line number Diff line number Diff line change
@@ -1,15 +1,67 @@
{ fetchurl, stdenv, substituteAll, meson, ninja, pkgconfig, gnome3, ibus, gettext, upower, wrapGAppsHook
, libcanberra-gtk3, accountsservice, libpwquality, libpulseaudio
, gdk-pixbuf, librsvg, libgudev, libsecret, gnome-color-manager
, libxml2, polkit, libxslt, libgtop, libsoup, colord, colord-gtk
, libkrb5, networkmanagerapplet, networkmanager, glibc
, libwacom, samba, shared-mime-info, tzdata, libgnomekbd
, docbook_xsl, modemmanager, clutter, clutter-gtk, cheese, gnome-session
, fontconfig, sound-theme-freedesktop, grilo, python3
, gtk3, glib, glib-networking, gsettings-desktop-schemas
, gnome-desktop, gnome-settings-daemon, gnome-online-accounts
, vino, gnome-bluetooth, tracker, adwaita-icon-theme
, udisks2, gsound, libhandy, cups, mutter }:
{ fetchurl
, stdenv
, substituteAll
, accountsservice
, adwaita-icon-theme
, cheese
, clutter
, clutter-gtk
, colord
, colord-gtk
, cups
, docbook_xsl
, fontconfig
, gdk-pixbuf
, gettext
, glib
, glib-networking
, glibc
, gnome-bluetooth
, gnome-color-manager
, gnome-desktop
, gnome-online-accounts
, gnome-session
, gnome-settings-daemon
, gnome3
, grilo
, grilo-plugins
, gsettings-desktop-schemas
, gsound
, gtk3
, ibus
, libcanberra-gtk3
, libgnomekbd
, libgtop
, libgudev
, libhandy
, libkrb5
, libpulseaudio
, libpwquality
, librsvg
, libsecret
, libsoup
, libwacom
, libxml2
, libxslt
, meson
, modemmanager
, mutter
, networkmanager
, networkmanagerapplet
, ninja
, pkgconfig
, polkit
, python3
, samba
, shared-mime-info
, sound-theme-freedesktop
, tracker
, tzdata
, udisks2
, upower
, vino
, wrapGAppsHook
}:

stdenv.mkDerivation rec {
pname = "gnome-control-center";
@@ -21,20 +73,61 @@ stdenv.mkDerivation rec {
};

nativeBuildInputs = [
meson ninja pkgconfig gettext wrapGAppsHook libxslt docbook_xsl
shared-mime-info python3
docbook_xsl
gettext
libxslt
meson
ninja
pkgconfig
python3
shared-mime-info
wrapGAppsHook
];

buildInputs = [
ibus gtk3 glib glib-networking upower gsettings-desktop-schemas
libxml2 gnome-desktop gnome-settings-daemon polkit libgtop
gnome-online-accounts libsoup colord libpulseaudio fontconfig colord-gtk
accountsservice libkrb5 networkmanagerapplet libwacom samba
grilo libpwquality vino libcanberra-gtk3 libgudev libsecret
gdk-pixbuf adwaita-icon-theme librsvg clutter clutter-gtk cheese
networkmanager modemmanager gnome-bluetooth tracker
udisks2 gsound libhandy
accountsservice
adwaita-icon-theme
cheese
clutter
clutter-gtk
colord
colord-gtk
fontconfig
gdk-pixbuf
glib
glib-networking
gnome-bluetooth
gnome-desktop
gnome-online-accounts
gnome-settings-daemon
grilo
grilo-plugins # for setting wallpaper from Flickr
gsettings-desktop-schemas
gsound
gtk3
ibus
libcanberra-gtk3
libgtop
libgudev
libhandy
libkrb5
libpulseaudio
libpwquality
librsvg
libsecret
libsoup
libwacom
libxml2
modemmanager
mutter # schemas for the keybindings
networkmanager
networkmanagerapplet
polkit
samba
tracker
udisks2
upower
vino
];

patches = [