Skip to content

Commit

Permalink
tlp: remove all /usr/ prefixes to fix install dirs
Browse files Browse the repository at this point in the history
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]: linrunner/TLP@d0d1231
[2]: #349759
  • Loading branch information
amarshall committed Oct 21, 2024
1 parent 7160181 commit 444f7cd
Showing 1 changed file with 4 additions and 10 deletions.
14 changes: 4 additions & 10 deletions pkgs/tools/misc/tlp/default.nix
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,10 @@
./patches/0002-reintroduce-tlp-sleep-service.patch
];

postPatch = ''
substituteInPlace Makefile --replace-fail ' ?= /usr/' ' ?= /'
'';

buildInputs = [ perl ];
nativeBuildInputs = [ makeWrapper ];

Expand All @@ -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" ]
Expand Down

0 comments on commit 444f7cd

Please sign in to comment.