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
thinkpad-scripts: init at 4.12.0 #81007
Conversation
|
||
meta = { | ||
description = | ||
"Screen rotation, docking and other scripts for ThinkPad® X220 and X230 Tablet"; |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Don't split lines please, it's harder to git grep
that way..
|
||
makeFlags = [ | ||
"DESTDIR=$(out)" | ||
"SPHINXBUILD=${python3Packages.sphinx}/bin/sphinx-build" |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Does the output has to include documentation?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
It seems to me that yes, unless I patch the Makefile
common-install:
install -d "$(DESTDIR)/lib/udev/rules.d/"
install -m 644 81-thinkpad-dock.rules -t "$(DESTDIR)/lib/udev/rules.d/"
#
install -d "$(DESTDIR)/lib/udev/hwdb.d/"
install -m 644 90-X2x0T-keyboard.hwdb -t "$(DESTDIR)/lib/udev/hwdb.d/"
#
install -d "$(DESTDIR)/etc/acpi/events/"
install -m 644 thinkpad-mutemic-acpi-hook -t "$(DESTDIR)/etc/acpi/events/"
install -m 644 thinkpad-rotate-acpi-hook-1-normal -t "$(DESTDIR)/etc/acpi/events/"
install -m 644 thinkpad-rotate-acpi-hook-1-rotated -t "$(DESTDIR)/etc/acpi/events/"
install -m 644 thinkpad-rotate-acpi-hook-2-normal -t "$(DESTDIR)/etc/acpi/events/"
install -m 644 thinkpad-rotate-acpi-hook-2-rotated -t "$(DESTDIR)/etc/acpi/events/"
install -m 644 thinkpad-dock-acpi-hook-1-on -t "$(DESTDIR)/etc/acpi/events/"
install -m 644 thinkpad-dock-acpi-hook-1-off -t "$(DESTDIR)/etc/acpi/events/"
install -m 644 thinkpad-dock-acpi-hook-2 -t "$(DESTDIR)/etc/acpi/events/"
#
cd desktop && $(MAKE) install
cd doc && $(MAKE) install
#
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
You don't have to (though I would have suggested a patch upstream) - you can use split output, see https://nixos.org/nixpkgs/manual/#sec-multiple-outputs- .
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Or, if you don't mind, you can rm -r
it in postInstall
.
"SHELL=${bash}/bin/bash" | ||
]; | ||
|
||
buildInputs = with python3Packages; [ sphinx ]; |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
buildInputs = with python3Packages; [ sphinx ]; | |
nativeBuildInputs = with python3Packages; [ sphinx ]; |
I feel stupid, but I've just realized that |
To be more precise: |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Perfect, thanks @dawidsowa and @doronbehar!
Motivation for this change
Add thinkpad-scripts
Things done
sandbox
innix.conf
on non-NixOS linux)nix-shell -p nixpkgs-review --run "nixpkgs-review wip"
./result/bin/
)nix path-info -S
before and after)