bug-guix
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

bug#38405: [PATCH] gnu: qtbase: Use absolute references in .prl files.


From: Marius Bakke
Subject: bug#38405: [PATCH] gnu: qtbase: Use absolute references in .prl files.
Date: Thu, 28 Nov 2019 00:18:13 +0100
User-agent: Notmuch/0.29.2 (https://notmuchmail.org) Emacs/26.3 (x86_64-pc-linux-gnu)

Marius Bakke <address@hidden> writes:

> This fixes <https://bugs.gnu.org/38405>.
>
> * gnu/packages/qt.scm (qtbase)[arguments]: Add phase 'patch-prl-files'.

[...]

> +         (add-after 'patch-mkspecs 'patch-prl-files
> +           (lambda* (#:key outputs #:allow-other-keys)
> +             (let ((out (assoc-ref outputs "out")))
> +               ;; Insert absolute references to the qtbase libraries because
> +               ;; QT_INSTALL_LIBS does not always resolve correctly, 
> depending
> +               ;; on context.  See <https://bugs.gnu.org/38405>
> +               (substitute* (find-files (string-append out "/lib") "\\.prl$")
> +                 (("\\$\\$\\[QT_INSTALL_LIBS\\]")
> +                  (string-append out "/lib")))
> +               #t)))

I pushed this hunk in a59e2dd8cd16655e379abb567baf978c94f3d48e, as I'm
fairly confident that this is the right thing to do.

Feedback still welcome however.  :-)

Attachment: signature.asc
Description: PGP signature


reply via email to

[Prev in Thread] Current Thread [Next in Thread]