Andy Wingo writes:

> Yeah almost!  Just two (?) more nits -- I seem to keep finding these.
> Sorry about that.

:-)

>>  (define-module (gnu packages cross-base)
>> -  #:use-module (guix licenses)
>> +  #:use-module ((guix licenses) #:prefix license:)
>>    #:use-module (gnu packages)
>> -  #:use-module (gnu packages gcc)
>>    #:use-module (gnu packages base)
>> +  #:use-module (gnu packages bash)
>> +  #:use-module (gnu packages gawk)
>> +  #:use-module (gnu packages gcc)
>>    #:use-module (gnu packages commencement)
>> +  #:use-module (gnu packages compression)
>>    #:use-module (gnu packages linux)
>> +  #:use-module (gnu packages mingw)
>> +  #:use-module (gnu packages multiprecision)
>>    #:use-module (guix packages)
>>    #:use-module (guix download)
>>    #:use-module (guix utils)
>
> It seems that of these additions, only mingw is necessary.  Can you check?

Indeed...another remnant of my earlier cross-gcc-core hack.  Removed
additions, still removing unused guix licenses.

>> + (string-append (getcwd) "/mingw-w64-v5.0-rc2/mingw-w64-headers")))
...
>> + (substitute* (string-append mingw-headers "/crt/_mingw.h")
>> + (("@MINGW_HAS_SECURE_API@") "#define MINGW_HAS_SECURE_API 1"))
>
> Humm, this v5.0-rc2 version is definitely going to break in the future.

Yes.

> OK, we're depending on the internal structure of a tarball, we know it's
> going to be a bit fragile, but uf...  If you have the bandwidth, a fix
> would be nice.  Maybe:
>
>   (define (unpacked-mingw-dir)
>     (match (scandir "." (lambda (name) (string-contains name "mingw-w64")))
>       ((mingw-dir)
>        (string-append (getcwd) "/" mingw-dir "/mingw-w64-headers"))))

That works quite nicely.  Changed to use it.

> You'll need to add (ice-9 match) and (ice-9 ftw) to #:modules, and you'd
> have to invoke this function after unpacking the tarball.

With these, of course.  Thanks!

Greetings,
Jan