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: 6d3ed732f8b7
Choose a base ref
...
head repository: NixOS/nixpkgs
compare: 31ff786277d1
Choose a head ref
  • 2 commits
  • 1 file changed
  • 1 contributor

Commits on Jan 16, 2019

  1. glib.setupHook: fix gsettings-schemas location

    GLib setup hook expects GSettings schemas to be installed in ${!outputLib}
    and tries to move them to gsettings-schemas/$name subdirectory to prevent
    conflicts. But the schemas will only end up in the library output when
    the build system recognizes makeFlags set by the setup hook, and in that case
    the move is not necessary, since the flag already includes the subdirectory.
    
    Normally, this is not an issue, since most packages relying on GSettings
    schemas either still use Autotools with gsettings.m4, or do not have a lib
    output set. But with the promulgation of multiple outputs in Nixpkgs and
    more and more projects switching to Meson, the issue will become increasingly
    common.
    
    We first noticed this problem with nm-applet.
    
    Closes #45043
    jtojnar committed Jan 16, 2019
    Copy the full SHA
    388faed View commit details
    Browse the repository at this point in the history

Commits on Jan 17, 2019

  1. Merge pull request #54130 from jtojnar/glib-gsettings-prefix

    glib.setupHook: fix gsettings-schemas location
    jtojnar committed Jan 17, 2019
    Copy the full SHA
    31ff786 View commit details
    Browse the repository at this point in the history