diff options
Diffstat (limited to 'pkgs/tools/misc/tlp/patches/fix-makefile-sed.patch')
| -rw-r--r-- | pkgs/tools/misc/tlp/patches/fix-makefile-sed.patch | 17 |
1 files changed, 8 insertions, 9 deletions
diff --git a/pkgs/tools/misc/tlp/patches/fix-makefile-sed.patch b/pkgs/tools/misc/tlp/patches/fix-makefile-sed.patch index 31639c02f4c..942c9a579f6 100644 --- a/pkgs/tools/misc/tlp/patches/fix-makefile-sed.patch +++ b/pkgs/tools/misc/tlp/patches/fix-makefile-sed.patch @@ -1,23 +1,26 @@ +commit c44347b3b813e209fff537b4d46d23430727a5e2 +Author: Bernardo Meurer <meurerbernardo@gmail.com> +Date: Tue Feb 25 21:27:39 2020 -0800 makefile: correctly sed paths - + The default Makefile for tlp makes a mess with catenating `DESTDIR` to everything, but then not actualy using the catenated (_ prefixed) variables to sed it's `.in` files. - + This patch makes sure that it correctly sets the paths, taking `DESTDIR` in account where it makes sense (e.g. /bin where we want $out/bin) but not where it doesn't (/etc/tlp.conf should be just that). - + The reason DESTDIR is used at all, as opposed to the more appropriate PREFIX, is covered in the nix formula, and is (also) due to the Makefile being a bit "different." diff --git a/Makefile b/Makefile -index e9bbab4..6b66651 100644 +index b5af74e..95122df 100644 --- a/Makefile +++ b/Makefile -@@ -51,19 +51,19 @@ _TPACPIBAT = $(DESTDIR)$(TPACPIBAT) +@@ -47,17 +47,17 @@ _TPACPIBAT = $(DESTDIR)$(TPACPIBAT) SED = sed \ -e "s|@TLPVER@|$(TLPVER)|g" \ @@ -25,18 +28,14 @@ index e9bbab4..6b66651 100644 - -e "s|@TLP_TLIB@|$(TLP_TLIB)|g" \ - -e "s|@TLP_FLIB@|$(TLP_FLIB)|g" \ - -e "s|@TLP_ULIB@|$(TLP_ULIB)|g" \ -- -e "s|@TLP_BATD@|$(TLP_BATD)|g" \ + -e "s|@TLP_SBIN@|$(_SBIN)|g" \ + -e "s|@TLP_TLIB@|$(_TLIB)|g" \ + -e "s|@TLP_FLIB@|$(_FLIB)|g" \ + -e "s|@TLP_ULIB@|$(_ULIB)|g" \ -+ -e "s|@TLP_BATD@|$(_BATD)|g" \ -e "s|@TLP_CONFUSR@|$(TLP_CONFUSR)|g" \ -e "s|@TLP_CONFDIR@|$(TLP_CONFDIR)|g" \ - -e "s|@TLP_CONFDEF@|$(TLP_CONFDEF)|g" \ -- -e "s|@TLP_CONFREN@|$(TLP_CONFREN)|g" \ + -e "s|@TLP_CONFDEF@|$(_CONFDEF)|g" \ -+ -e "s|@TLP_CONFREN@|$(_CONFREN)|g" \ -e "s|@TLP_CONF@|$(TLP_CONF)|g" \ -e "s|@TLP_RUN@|$(TLP_RUN)|g" \ -e "s|@TLP_VAR@|$(TLP_VAR)|g" \ |