guix-patches
[Top][All Lists]
Advanced

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

[bug#28719] [PATCH 5/6] gnu: qscintilla: Adjust installation directory l


From: 宋文武
Subject: [bug#28719] [PATCH 5/6] gnu: qscintilla: Adjust installation directory layout.
Date: Tue, 10 Oct 2017 19:05:12 +0800
User-agent: Gnus/5.13 (Gnus v5.13) Emacs/25.2 (gnu/linux)

Hartmut Goebel <address@hidden> writes:

> * gnu/packages/qt.scm (qscintilla)[#:phase configure]: Set QT_INSTALL_DATA and
>   QT_HOST_DATA to $OUT/lib/qt5.
> ---
>  gnu/packages/qt.scm | 6 ++++--
>  1 file changed, 4 insertions(+), 2 deletions(-)
>
> diff --git a/gnu/packages/qt.scm b/gnu/packages/qt.scm
> index 1b5058ba1..775982757 100644
> --- a/gnu/packages/qt.scm
> +++ b/gnu/packages/qt.scm
> @@ -1467,8 +1467,10 @@ contain over 620 classes.")
>                    (string-append out "/include"))
>                   (("\$\$\[QT_INSTALL_TRANSLATIONS\]")
>                    (string-append out "/translations"))
> -                 (("\$\$\[QT_INSTALL_DATA\]") out)
> -                 (("\$\$\[QT_HOST_DATA\]") out))
> +                 (("\$\$\[QT_INSTALL_DATA\]")
> +                  (string-append out "/lib/qt$${QT_MAJOR_VERSION}"))
> +                 (("\$\$\[QT_HOST_DATA\]")
> +                 (string-append out "/lib/qt$${QT_MAJOR_VERSION}")))
>                 (zero? (system* "qmake"))))))))
>      (native-inputs `(("qtbase" ,qtbase)))
>      (home-page 
> "http://www.riverbankcomputing.co.uk/software/qscintilla/intro";)

Idelly, With the previous "Fix install paths" patch, this substitute for
qscintilla.pro could be removed.  Can you check it?  Thanks!






reply via email to

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