qbit/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

tlp: remove all /usr/ prefixes to fix install dirs

Browse Source 
TLP v1.7.0 [changed][1] more directories to be prefixed under `/usr/`,
which we do not want (see also [this Nixpkgs issue][2]). We already were
removing these prefixes for some (but not all) paths. To reduce the
chances of breaking in the future (and clarify why these are being set),
replace all of them uniformly.

[1]: d0d1231960
[2]: https://github.com/NixOS/nixpkgs/issues/349759
This commit is contained in:
Andrew Marshall 2024-10-21 11:30:56 -04:00
parent 716018160d
commit 444f7cd73b
1 changed files with 4 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
pkgs/tools/misc/tlp/default.nix
View File

@ -39,6 +39,10 @@
./patches/0002-reintroduce-tlp-sleep-service.patch
];
postPatch = ''
substituteInPlace Makefile --replace-fail ' ?= /usr/' ' ?= /'
'';
buildInputs = [ perl ];
nativeBuildInputs = [ makeWrapper ];
@ -55,16 +59,6 @@
"TLP_WITH_SYSTEMD=1"
"DESTDIR=${placeholder "out"}"
"TLP_BATD=/share/tlp/bat.d"
"TLP_BIN=/bin"
"TLP_CONFDEF=/share/tlp/defaults.conf"
"TLP_CONFREN=/share/tlp/rename.conf"
"TLP_FLIB=/share/tlp/func.d"
"TLP_MAN=/share/man"
"TLP_META=/share/metainfo"
"TLP_SBIN=/sbin"
"TLP_SHCPL=/share/bash-completion/completions"
"TLP_TLIB=/share/tlp"
];
installTargets = [ "install-tlp" "install-man" ]