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

solaar: 2018-02-02 -> 2019-01-30 + udev rules inclusion #57592

Merged
merged 3 commits into from
Mar 16, 2019

Conversation

samueldr
Copy link
Member

Motivation for this change

Includes the udev rules in the solaar package. This allows the following to work.

{ pkgs, ... }:
{
  services.udev.packages = [ pkgs.solaar ];
}

In addition, update to the latest commit.

Things done
  • ☑ Tested using sandboxing (nix.useSandbox on NixOS, or option sandbox in nix.conf on non-NixOS)
  • Built on platform(s)
    • ☑ NixOS
  • ☑ Tested compilation of all pkgs that depend on this change using nix-shell -p nox --run "nox-review wip"
  • ☑ Tested execution of all binary files (usually in ./result/bin/)
  • ☑ Assured whether relevant documentation is up to date
  • ☑ Fits CONTRIBUTING.md.


mkdir -p $out/lib/udev/rules.d
for f in rules.d/*.rules; do
cp "$f" $out/lib/udev/rules.d/
Copy link
Contributor

Choose a reason for hiding this comment

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

what about cp -r rules.d $out/lib/udev ?

Copy link
Member Author

@samueldr samueldr Mar 13, 2019

Choose a reason for hiding this comment

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

there's an install.sh in the directory :)

https://github.com/pwr/Solaar/tree/master/rules.d

Copy link
Contributor

Choose a reason for hiding this comment

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

ah, then it would be cp rules.d/*.rules $out/lib/udev/rules.d/

@samueldr
Copy link
Member Author

Also took the opportunity to cleanup using pname/version and removing a now unused attribute.

From nixpkgs manual:

namePrefix: Prepends text to ${name} parameter. In case of libraries, this defaults to "python3.5-" for Python 3.5, etc., and in case of applications to "".

@GrahamcOfBorg GrahamcOfBorg added 10.rebuild-darwin: 0 This PR does not cause any packages to rebuild on Darwin 10.rebuild-linux: 1-10 labels Mar 13, 2019
@srhb srhb merged commit 271ce3f into NixOS:master Mar 16, 2019
@samueldr samueldr deleted the solaar/update branch March 16, 2019 16:21
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
10.rebuild-darwin: 0 This PR does not cause any packages to rebuild on Darwin 10.rebuild-linux: 1-10
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants