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

gtk3: Clean up #110599

Merged
merged 1 commit into from Jan 23, 2021
Merged

gtk3: Clean up #110599

merged 1 commit into from Jan 23, 2021

Conversation

jtojnar
Copy link
Contributor

@jtojnar jtojnar commented Jan 23, 2021

Motivation for this change

This will make it more in line with the incoming GTK 4 package. (#107405)

Should be a no-op.

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.

- Reorder the expression according to https://github.com/jtojnar/nixpkgs-hammering/blob/master/explanations/attribute-ordering.md
- Do not use `with lib;` at top-level.
- Use lib.optionals instead of lib.optional for cleaner style.
- Replace docbook_xsl alias with docbook-xsl-nons.

This will make it more in line with the incoming GTK 4 package.
Comment on lines 48 to 49

assert cupsSupport -> cups != null;
Copy link
Member

Choose a reason for hiding this comment

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

Suggested change
assert cupsSupport -> cups != null;

also the cups ? null can be removed.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

I think this is to fail fast on systems that null cups in overlays or something.

@jtojnar jtojnar merged commit ba68c3e into NixOS:master Jan 23, 2021
@jtojnar jtojnar deleted the gtk3-cleanup branch January 23, 2021 15:05
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

2 participants