Re: [PATCH] gnu: powertop: Patch absolute file names.

[ludo@gnu.org (Ludovic Courtès)]

Mathieu Lirzin <mthl@gnu.org> skribis:

> Efraim Flashner <efraim@flashner.co.il> writes:
>
>> On Mon, Apr 18, 2016 at 11:01:41PM +0200, Mathieu Lirzin wrote:
>>
>>> +    (arguments
>>> +     '(#:phases
>>> +       (modify-phases %standard-phases
>>> +         ;; TODO: Patch some hardcoded "wlan0" in calibrate/calibrate.cpp to
>>> +         ;; allow calibrating the network interface in GuixSD.
>>> +         (add-after 'unpack 'patch-absolute-file-names
>>> +           (lambda* (#:key inputs #:allow-other-keys)
>>> +             (let ((kmod (assoc-ref inputs "kmod")))
>>> +               (substitute* (find-files "src" ".*\\.cpp" )
>>> +                 (("/sbin/modprobe") (string-append kmod "/bin/modprobe"))
>>> +                 ;; These programs are only needed to calibrate, so using
>>> +                 ;; relative file names avoids adding extra inputs.  When they
>>> +                 ;; are missing powertop gracefully handle it.
>>> +                 (("/usr/bin/xset") "xset")
>>> +                 (("/usr/sbin/hciconfig") "hciconfig") ;XXX:not packaged yet
>>> +                 (("/usr/bin/hcitool") "hcitool"))     ;XXX:not packaged yet
>>
>> hci* programs are part of the bluez package. According to apt-file,
>> debian has xset as part of x11-xserver-utils.
>
> Thank you for taking to search this.  :) I don't intend to package
> "bluez" since I have no use of Bluetooth, and xset is already packaged
> in Guix.  Those programs are called when doing ‘powertop --calibrate’
> like this:
>
>   if(!system("DISPLAY=:0 /usr/bin/xset dpms force off"))
>     printf("System is not available\n");
>                 
> So IMO adding them as explicit inputs will not make sense since those
> ‘system’ calls are meant as feature tests.  WDYT?

Agreed.  It’s OK to have them searched in $PATH as needed, so the patch
above is OK (without “XXX” comments even.)

Thanks,
Ludo’.