|
From: | Hartmut Goebel |
Subject: | [bug#35866] [PATCH] gnu: Add qtwebengine. |
Date: | Tue, 31 Dec 2019 14:10:08 +0100 |
User-agent: | Mozilla/5.0 (X11; Linux x86_64; rv:68.0) Gecko/20100101 Thunderbird/68.3.0 |
+ (uri + (string-append "https://download.qt.io/official_releases/qt/" + (substring version 0 4) + "/" version "/submodules/" + (string-append name "-everywhere-src-" version) + ".tar.xz"))
Please use the same code and formatting as sued for qtsvg. This helps keeping the code consistent.
I suggest to put this into *two* new phases: `patch-source` (or so) containing the substitute stuff, and `setup-configure` for setting the environment variables.+ `(modify-phases ,phases + (replace 'configure + (lambda* (#:key inputs outputs #:allow-other-keys) + ;; Avoids potential race conditions
+ (substitute* "src/core/web_engine_library_info.cpp" + (("QLibraryInfo::location\\(QLibraryInfo::TranslationsPath\\)") + (format #f "QLatin1String(\"~a\")" (string-append (assoc-ref outputs "out") "/share/qt5/translations"))) + (("QLibraryInfo::location\\(QLibraryInfo::DataPath\\)") + (format #f "QLatin1String(\"~a\")" (string-append (assoc-ref outputs "out") "/share/qt5"))))
I suggest *not* using `format`, as we rarely use it in
substitutes and you are using `string-append` anyway. I also
suggest to define a variable `out` to be used here (same for
`nss`, `udev` below) to avoid having `assic-ref` here, see [0] as
an example. Then `format` might even be beneficial:
+ (format #f "QLatin1String(\"~a/share/qt5/translations\")"
out)
+ (string-append "QLatin1String(\"" out "/share/qt5/translations\")")
[0]
<https://git.savannah.gnu.org/cgit/guix.git/tree/gnu/packages/qt.scm#n605>
+ ;; Valid QT_BUILD_PARTS variables are: + ;; libs tools tests examples demos docs translations + (invoke "qmake" "QT_BUILD_PARTS = libs tools" "--" + "--webengine-printing-and-pdf=no" + "--webengine-ffmpeg=system" + "--webengine-icu=system" + "--webengine-pepper-plugins=no")))))
Would setting `#:configure-flags` with "-DBUILD_TESTS=off" (see
e.g. [1]) work, too, instead of passing "QT_BUILD_PARTS"?
[1]
<https://git.savannah.gnu.org/cgit/guix.git/tree/gnu/packages/qt.scm#n2119>
-- Regards Hartmut Goebel | Hartmut Goebel | address@hidden | | www.crazy-compilers.com | compilers which you thought are impossible |
[Prev in Thread] | Current Thread | [Next in Thread] |