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: 1a44e325d2b4
Choose a base ref
...
head repository: NixOS/nixpkgs
compare: 0d877fbb2932
Choose a head ref
  • 2 commits
  • 1 file changed
  • 2 contributors

Commits on Mar 4, 2020

  1. glib.setupHook: run glibPreFixupPhase before gappsWrapperArgsHook 

    Since we split wrapGAppsHook and move its variable initialization to preFixupPhases in #81475, it was getting run before glibPreFixupPhase which sets GSETTINGS_SCHEMAS_PATH variable gappsWrapperArgsHook depends on. Let's introduce this ugly hack to ensure glibPreFixupPhase will run before gappsWrapperArgsHook.
    @jtojnar
    jtojnar committed Mar 4, 2020
    Copy the full SHA
    8e4f502 View commit details
    Browse the repository at this point in the history

  2. Merge pull request #81759 from jtojnar/gio-wgah-order-hack 

    glib.setupHook: run glibPreFixupPhase before gappsWrapperArgsHook
    @worldofpeace
    worldofpeace committed Mar 4, 2020
    Copy the full SHA
    0d877fb View commit details
    Browse the repository at this point in the history