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

xlibsWrapper: remove deprecated and now unused wrapper package #207938

Merged
merged 1 commit into from
Dec 29, 2022

Conversation

trofi
Copy link
Contributor

@trofi trofi commented Dec 27, 2022

There should be no reason to use this package as it's a remnant of non-modular X. Chances are you do not want every single library it used to pull in:

  freetype fontconfig xorg.xorgproto xorg.libX11 xorg.libXt
  xorg.libXft xorg.libXext xorg.libSM xorg.libICE

Just pick the ones you really need instead.

nixpkgs does not have any users of xlibsWrapper.

Closes: #194054

Description of changes
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/)
  • 23.05 Release Notes (or backporting 22.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.

@nixos-discourse
Copy link

This pull request has been mentioned on NixOS Discourse. There might be relevant details there:

https://discourse.nixos.org/t/call-for-help-to-migrate-packages-from-xlibswrapper/22203/2

pkgs/top-level/aliases.nix Outdated Show resolved Hide resolved
@trofi trofi marked this pull request as draft December 27, 2022 14:03
@trofi
Copy link
Contributor Author

trofi commented Dec 27, 2022

Forgot one last user: gtk2 on darwin. Switching to draft until that is sorted.

@SuperSandro2000 SuperSandro2000 marked this pull request as ready for review December 28, 2022 07:09
@SuperSandro2000
Copy link
Member

@ofborg eval

There should be no reason to use this package as it's a remnant of
non-modular X. Chances are you do not want every single library it
used to pull in:

      freetype fontconfig xorg.xorgproto xorg.libX11 xorg.libXt
      xorg.libXft xorg.libXext xorg.libSM xorg.libICE

Just pick the ones you really need instead.

`nixpkgs` does not have any users of `xlibsWrapper`.

Closes: NixOS#194054
@trofi
Copy link
Contributor Author

trofi commented Dec 28, 2022

Rebased past gtk2 fix. Should be ready for review now.

@SuperSandro2000
Copy link
Member

ofborg is merging the PR into master so this is not strictly necessary.

@SuperSandro2000
Copy link
Member

Thank you so much trofi! ❤️

@SuperSandro2000 SuperSandro2000 merged commit f104523 into NixOS:staging Dec 29, 2022
@trofi trofi deleted the xlibsWrapper-removal branch December 29, 2022 14:25
@Mifom Mifom mentioned this pull request Apr 9, 2023
3 tasks
bors-servo added a commit to servo/servo that referenced this pull request Apr 9, 2023
Update shell.nix

<!-- Please describe your changes on the following line: -->
After NixOS/nixpkgs#207938 was merged the option `pkgs.xlibsWrapper` was removed. This PR replacing it with `xorg.libX11` as this is enouth to build and test in `nix-shell` environment.

---
<!-- Thank you for contributing to Servo! Please replace each `[ ]` by `[X]` when the step is complete, and replace `___` with appropriate data: -->
- [X] `./mach build -d` does not report any errors
- [X] `./mach test-tidy` does not report any errors

<!-- Either: -->
- [X] These changes do not require tests because PR updates nix build environment.

<!-- Also, please make sure that "Allow edits from maintainers" checkbox is checked, so that we can help you if you get stuck somewhere along the way.-->

<!-- Pull requests that do not address these steps are welcome, but they will require additional verification as part of the review process. -->
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.

4 participants