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.

Sign up for GitHub

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

nixos/wrap-gapps-hook: don't add data directories of icon dependencies into XDG_DATA_DIRS #163623

Merged
merged 2 commits into from
Mar 25, 2022
Merged

nixos/wrap-gapps-hook: don't add data directories of icon dependencies into XDG_DATA_DIRS #163623

merged 2 commits into from
Mar 25, 2022

Conversation

ilya-fedin
Copy link
Contributor

@ilya-fedin ilya-fedin commented Mar 10, 2022 •
edited
Loading

Description of changes

As discussed in #163590, it's not really required and has a side effect of adding refeferences to packages from nativeBuildInputs that aren't really required

Fixes #163590

Things done
  • Built on platform(s)
    • x86_64-linux
    • aarch64-linux
    • x86_64-darwin
    • aarch64-darwin
  • For non-Linux: Is sandbox = true set in nix.conf? (See Nix manual)
  • Tested, as applicable:
  • Tested compilation of all packages that depend on this change using nix-shell -p nixpkgs-review --run "nixpkgs-review rev HEAD". Note: all changes have to be committed, also see nixpkgs-review usage
  • Tested basic functionality of all binary files (usually in ./result/bin/)
  • 22.05 Release Notes (or backporting 21.11 Release notes)
    • (Package updates) Added a release notes entry if the change is major or breaking
    • (Module updates) Added a release notes entry if the change is significant
    • (Module addition) Added a release notes entry if adding a new NixOS module
    • (Release notes changes) Ran nixos/doc/manual/md-to-db.sh to update generated release notes
  • Fits CONTRIBUTING.md.

@ilya-fedin
nixos/wrap-gapps-hook: don't add data directories of icon dependencie…
b1e73fa 
…s into XDG_DATA_DIRS

As discussed in NixOS#163590, it's not really required and has a side effect of adding refeferences to packages from nativeBuildInputs that aren't really required
@ilya-fedin ilya-fedin requested a review from Ericson2314 as a code owner March 10, 2022 22:08
@jtojnar
Copy link
Member

jtojnar commented Mar 10, 2022

Will also need to update doc/languages-frameworks/gnome.section.md

@github-actions github-actions bot added 6.topic: GNOME GNOME desktop environment and its underlying platform 8.has: documentation This PR adds or changes documentation labels Mar 10, 2022
@ilya-fedin
Copy link
Contributor Author

Done

@ilya-fedin ilya-fedin force-pushed the fix-mate-utils-inkscape branch 3 times, most recently from 623000a to 9a702fc Compare March 17, 2022 06:30
jtojnar
jtojnar approved these changes Mar 17, 2022
View reviewed changes
Copy link
Member

@jtojnar jtojnar left a comment

Choose a reason for hiding this comment

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

LGTM, thanks.

@jtojnar jtojnar requested review from romildo and bobby285271 March 17, 2022 06:34
@bobby285271 bobby285271 changed the base branch from master to staging March 17, 2022 07:52
@bobby285271 bobby285271 mentioned this pull request Mar 17, 2022
Merged
13 tasks
@ilya-fedin ilya-fedin force-pushed the fix-mate-utils-inkscape branch from 9a702fc to 802c818 Compare March 17, 2022 09:26
jtojnar
jtojnar approved these changes Mar 17, 2022
View reviewed changes
Copy link
Member

@jtojnar jtojnar left a comment

Choose a reason for hiding this comment

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

Thanks.

@bobby285271 bobby285271 mentioned this pull request Mar 17, 2022
Merged
14 tasks
bobby285271 added a commit to bobby285271/nixpkgs that referenced this pull request Mar 18, 2022
@bobby285271 @jtojnar
elementary-planner: pick up hardcoded icon theme
76ab64a 
With NixOS#163623, we need to handle
the hardcoded icon theme ourselves.

Co-authored-by: Jan Tojnar <[email protected]>
@bobby285271 bobby285271 mentioned this pull request Mar 19, 2022
Merged
13 tasks
@ilya-fedin
Copy link
Contributor Author

Is there a blocker? 🤔

@romildo romildo merged commit eff8a32 into NixOS:staging Mar 25, 2022
@ilya-fedin ilya-fedin deleted the fix-mate-utils-inkscape branch April 1, 2022 03:30
@max-privatevoid max-privatevoid mentioned this pull request May 5, 2022
Closed
This was referenced May 9, 2022
Merged
Closed
@abathur abathur mentioned this pull request May 29, 2023
Closed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@bobby285271 bobby285271 bobby285271 left review comments

@romildo romildo romildo approved these changes

@jtojnar jtojnar jtojnar approved these changes

@Ericson2314 Ericson2314 Awaiting requested review from Ericson2314

Assignees
No one assigned
Labels
6.topic: GNOME GNOME desktop environment and its underlying platform 8.has: documentation This PR adds or changes documentation 10.rebuild-darwin: 101-500 10.rebuild-linux: 501+ 10.rebuild-linux: 5001+
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

mate-utils pulls inkscape to the system
4 participants
@ilya-fedin @jtojnar @romildo @bobby285271