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
base: 0f395d6faea1
Choose a base ref
...
head repository: NixOS/nixpkgs
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
    Browse the repository at this point in the history

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

    @jtojnar
    jtojnar committed Aug 24, 2019
    Copy the full SHA
    040a09a View commit details
    Browse the repository at this point in the history

  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
    Browse the repository at this point in the history

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

    nixos/gnome3: fix default background setting
    @worldofpeace
    worldofpeace committed Aug 24, 2019
    Copy the full SHA
    e075227 View commit details
    Browse the repository at this point in the history