Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

glib.setupHook: run glibPreFixupPhase before gappsWrapperArgsHook #81759

Merged
merged 1 commit into from Mar 4, 2020
Merged

glib.setupHook: run glibPreFixupPhase before gappsWrapperArgsHook #81759

merged 1 commit into from Mar 4, 2020

Conversation

jtojnar
Copy link
Contributor

@jtojnar jtojnar commented Mar 4, 2020

Motivation for this change

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.

Things done
  • Tested using sandboxing (nix.useSandbox on NixOS, or option sandbox in nix.conf on non-NixOS linux)
  • Built on platform(s)
    • NixOS
    • macOS
    • other Linux distributions
  • Tested via one or more NixOS test(s) if existing and applicable for the change (look inside nixos/tests)
  • Tested compilation of all pkgs that depend on this change using nix-shell -p nixpkgs-review --run "nixpkgs-review wip"
  • Tested execution of all binary files (usually in ./result/bin/)
  • Determined the impact on package closure size (by running nix path-info -S before and after)
  • Ensured that relevant documentation is up to date
  • Fits CONTRIBUTING.md.

lovesegfault
lovesegfault approved these changes Mar 4, 2020
View reviewed changes
Copy link
Member

@lovesegfault lovesegfault left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LHTM: Looks Horrible To Me

@jtojnar
glib.setupHook: run glibPreFixupPhase before gappsWrapperArgsHook
8e4f502 
Since we split wrapGAppsHook and move its variable initialization to preFixupPhases in NixOS#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.
worldofpeace
worldofpeace approved these changes Mar 4, 2020
View reviewed changes
Copy link
Contributor

@worldofpeace worldofpeace left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Should work as intended

@worldofpeace worldofpeace merged commit 0d877fb into NixOS:staging Mar 4, 2020
@worldofpeace
Copy link
Contributor

backported to 20.03 in e544e03

@jtojnar jtojnar deleted the gio-wgah-order-hack branch April 11, 2020 16:40
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@lovesegfault lovesegfault lovesegfault approved these changes

@worldofpeace worldofpeace worldofpeace approved these changes

Assignees
No one assigned
Labels
1.severity: blocker 10.rebuild-darwin: 501+ 10.rebuild-darwin: 1001-2500 10.rebuild-linux: 501+ 10.rebuild-linux: 5001+
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
3 participants
@jtojnar @worldofpeace @lovesegfault