Skip to content

nixos/udev: use udev rules from $lib if present, otherwise $out #93006

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

Closed
flokli wants to merge 1 commit into from
Closed

nixos/udev: use udev rules from $lib if present, otherwise $out #93006

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 6 additions & 0 deletions nixos/doc/manual/release-notes/rl-2009.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -699,6 +699,12 @@ systemd.services.nginx.serviceConfig.ReadWritePaths = [ "/var/www" ];
There are no functional changes, however this may require updating some configurations to use correct types for all attributes.
</para>
</listitem>
<listitem>
<para>
In the case of multiple output derivations, the <link linkend="opt-services.udev.packages">services.udev.packages</link> option
now takes udev rules from <literal>lib</literal>, not <literal>bin</literal>.
Copy link
Contributor

@Valodim Valodim Jul 12, 2020

Choose a reason for hiding this comment

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

Suggested change
now takes udev rules from <literal>lib</literal>, not <literal>bin</literal>.
now takes udev rules from the <literal>lib</literal>, <literal>out</literal>, or default output (in that order), not <literal>bin</literal>.

</para>
</listitem>
</itemizedlist>
</section>
</section>
2 changes: 1 addition & 1 deletion nixos/modules/services/hardware/udev.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -190,7 +190,7 @@ in
<filename><replaceable>pkg</replaceable>/lib/udev/rules.d</filename>
will be included.
Copy link
Contributor

@Valodim Valodim Jul 12, 2020

Choose a reason for hiding this comment

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

This documentation should definitely mention that this applies to files from the lib or default output.

'';
apply = map getBin;
apply = map getLib;
};

path = mkOption {
Expand Down
2 changes: 1 addition & 1 deletion pkgs/development/libraries/kde-frameworks/bluez-qt.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,6 @@ mkDerivation {
propagatedBuildInputs = [ qtbase ];
preConfigure = ''
substituteInPlace CMakeLists.txt \
--replace /lib/udev/rules.d "$bin/lib/udev/rules.d"
--replace /lib/udev/rules.d "$out/lib/udev/rules.d"
'';
}