xorg: remove xlibsWrapper attribute, use top-level one instead#194044
Merged
SuperSandro2000 merged 6 commits intoNixOS:masterfrom Oct 2, 2022
Merged
xorg: remove xlibsWrapper attribute, use top-level one instead#194044SuperSandro2000 merged 6 commits intoNixOS:masterfrom
SuperSandro2000 merged 6 commits intoNixOS:masterfrom
Conversation
df2a2b3 to
267e411
Compare
83 tasks
Member
|
Well, the only problem with this PR: all commits are labeled
Please reword them to the expected
|
I noticed this attribute when tried to override `xorg` scope via
overlay:
final: prev {
xorg = prev.xorg.overrideScope' (f: p: {
libXfont2 = p.libXfont2.overrideAttrs (oa: {
patches = (oa.patches or []) ++ [
../libXfont2/nofollow.patch
];
});
}) // { inherit (prev) xlibsWrapper; };
}
As a result I got unexpected `pulseaudio` build failures:
$ nix build --no-link -f. pulseaudio
error: attribute 'xlibsWrapper' missing
at pkgs/servers/pulseaudio/default.nix:79:37:
78| ++ lib.optional jackaudioSupport libjack2
79| ++ lib.optionals x11Support [ xorg.xlibsWrapper xorg.libXtst xorg.libXi ]
| ^
80| ++ lib.optional useSystemd systemd
Previous changes in this branch remove references to xorg.xlibsWrapper
in favour of xlibsWrapper. Let's remove injection of this attribute into
`xorg.
267e411 to
f7262e0
Compare
Contributor
Author
Good point! Updated the descriptions. |
Member
|
I will remember this to always be explicit with package listing. I notice a certain amount of novices using |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Description of changes
xorg: remove xlibsWrapper attribute, use top-level one instead
I noticed this attribute when tried to override
xorgscope viaoverlay:
As a result I got unexpected
pulseaudiobuild failures:Previous changes in this branch remove references to xorg.xlibsWrapper
in favour of xlibsWrapper. Let's remove injection of this attribute into
`xorg.
Things done
sandbox = trueset innix.conf? (See Nix manual)nix-shell -p nixpkgs-review --run "nixpkgs-review rev HEAD". Note: all changes have to be committed, also see nixpkgs-review usage./result/bin/)nixos/doc/manual/md-to-db.shto update generated release notes