Commit graph

24 commits

Author SHA1 Message Date
Ben Siraphob 2f78ee7e81 pkgs/development: stdenv.lib -> lib 2021-01-24 00:16:29 +07:00
Jonathan Ringer 9bb3fccb5b treewide: pkgs.pkgconfig -> pkgs.pkg-config, move pkgconfig to alias.nix
continuation of #109595

pkgconfig was aliased in 2018, however, it remained in
all-packages.nix due to its wide usage. This cleans
up the remaining references to pkgs.pkgsconfig and
moves the entry to aliases.nix.

python3Packages.pkgconfig remained unchanged because
it's the canonical name of the upstream package
on pypi.
2021-01-19 01:16:25 -08:00
Doron Behar 983465f13a qt515.qtwebkit: unbreak 🎉
A copy of #96309 essentially - fix the build of it with bison-3.7.
2020-11-21 10:54:43 +02:00
Thomas Tuegel 01bcfd3579 qtwebkit: mark broken with Qt 5.15 2020-09-07 08:05:24 -05:00
Luka Blaskovic 81d778466c qtwebkit: build with bison3 2020-01-13 21:35:19 +00:00
Dima 3bfe0872b9 qt5.{qtwebengine, qtwebkit}: fix -Wno-class-memaccess warning for clang
With a previous fix for log size issues due to GCC 8
a gcc specific `-W` flag was added that clang does
not know, so it spams the logs.
2019-10-07 04:12:26 +02:00
Dima 6f1ad0676f qtwebkit: fixing build / reducing build log size
GCC 8 introduced a new type of warning `-Wclass-memaccess` which
is included in `-Wall`. This warnings spits out *a million* of warnings
like the following:

```
[...]
/build/source/Source/WTF/wtf/Vector.h:128:15: warning: 'void* memcpy(void*, const void*, size_t)' writing to an object of type 'class WTF::RefPtr<WebCore::TransformOperation>' with no trivial copy-assignment; use copy-assignment or copy-initialization instead [-Wclass-memaccess]
         memcpy(dst, src, reinterpret_cast<const char*>(srcEnd) - reinterpret_cast<const char*>(src));
[...]
``

Logs demonstrating the issue:
https://hydra.nixos.org/build/100205478/nixlog/1

While I don't think disabling warnings is the best way to deal with this,
there is alrady precedent for this package and I don't feel confident enough
to either patch or bump this package.

Please view this as a low-friction sub-optimal suggestion in case nobody else
has a better fix.
2019-09-10 18:42:30 +02:00
Daiderd Jordan cbfbe9ca1e
qt: remove cf-private 2019-07-03 22:20:16 +02:00
volth f3282c8d1e treewide: remove unused variables (#63177)
* treewide: remove unused variables

* making ofborg happy
2019-06-16 19:59:05 +00:00
Will Dietz c29b17eecb qtwebkit: fix path for libgdk-x11-2.0, it's in gtk2 apparently 2019-04-29 08:10:09 -05:00
Dmitry Kalinkin 518f997eb5
qt5.qtwebkit: don't set qmake variables for cmake build 2019-02-19 23:52:07 -05:00
Dmitry Kalinkin 4bbd00e934
qt511.qtwebkit: fix on darwin
readline is used on macOS and iOS for some javascript console (JSC). It
seems to be easier to disable it than to fix it.
2019-02-19 23:52:06 -05:00
Dmitry Kalinkin 67186defda
qt5.qtwebkit: refactor version comparison
This introduces usingAnnulenWebkitFork variable. Using version
check for qtbase.version is misleading because annulen's fork is not
tied to a specific qt5 release.
2019-02-19 23:51:24 -05:00
Dmitry Kalinkin f212dd2e32
qt5.qtwebkit: link against libicucore.dylib from darwin.ICU instead of /usr/lib
The impure library was introduced in

   775531c1e3 ('qt58: extend darwin compatibility')

cmake-based build can use a non-apple ICU if -DMACOS_USE_SYSTEM_ICU=OFF
is set.
2019-02-19 23:51:19 -05:00
Alyssa Ross 874468f23e
qt59.qtwebkit: fix build on Darwin 2018-11-17 23:17:27 +00:00
Alyssa Ross 1c70685fdb
qt59.qtwebkit: fix build on Darwin
Why is qtmultimedia only needed on Darwin? Why does it only fix 5.9, not
5.11? These things I do not know. What I do know is that, for some
reason, this makes qt59.qtwebkit build on Darwin.

I think the reason it hasn't also fixed 5.11 might be something to do
with the version of qtmultimedia, but I don't know enough about Qt or
cmake to figure it out. The error when trying to build qt511.qtwebkit
(with or without these changes) is:

    CMake Error at Source/cmake/OptionsQt.cmake:739 (find_package):
      Could not find a package configuration file provided by "Qt5Multimedia"
      (requested version 5.2.0) with any of the following names:

        Qt5MultimediaConfig.cmake
        qt5multimedia-config.cmake

      Add the installation prefix of "Qt5Multimedia" to CMAKE_PREFIX_PATH or set
      "Qt5Multimedia_DIR" to a directory containing one of the above files.  If
      "Qt5Multimedia" provides a separate development package or SDK, be sure it
      has been installed.
    Call Stack (most recent call first):
      Source/cmake/WebKitCommon.cmake:50 (include)
      CMakeLists.txt:137 (include)

    -- Configuring incomplete, errors occurred!
    See also "/tmp/nix-build-qtwebkit-5.212-alpha-01-26-2018.drv-0/source/build/CMakeFiles/CMakeOutput.log".
    See also "/tmp/nix-build-qtwebkit-5.212-alpha-01-26-2018.drv-0/source/build/CMakeFiles/CMakeError.log".
2018-10-19 10:36:48 +01:00
Samuel Dionne-Riel cb380983ed qt5.qtwebkit: Fixes modules src being subtly broken.
b785d4813e introduced breakage in Qt
modules for 5.6 and 5.9, especially visible is Qt Webkit.

This was manifested by having a non-sensical build log where it is using
the top-level `src` attribute as source instead of Qt Webkit's own
source.

Were it not for the `src` top-level attribute (which is a legit
package), the error would have been made obvious by passing `null` to
`src`.

This partily reverts newly introduced way `src` can be passed to a
qtModule, instead relying on extending the `srcs` attrset.

For ZHF #45960
2018-09-08 14:20:23 -04:00
Jan Malakhovski 875b48e3ea qt5.qtwebkit: disable tests 2018-08-11 09:35:36 +00:00
Jan Malakhovski 9cbddc6955 qt5.qtwebkit.hyphen: fix tests 2018-08-11 09:35:19 +00:00
volth 52f53c69ce pkgs/*: remove unreferenced function arguments 2018-07-21 02:48:04 +00:00
Bastian Köcher b785d4813e qt5: 5.10 -> 5.11
This is the first time since 5.9 that we also update `qtwebkit`.
`qtwebkit` is not maintained by Qt anymore and thus, we switch to the
community port as for example arch has done. To prevent pulling in
single patches, we just stick to the latest git version.
2018-06-12 14:27:11 +02:00
Josef Kemetmüller 472f21951a qt5.qtwebkit: Reduce log size to fix hydra build
This should fix the darwin build of qtwebkit.
2018-05-06 18:44:31 +02:00
Vladimír Čunát d4f1587da5
qt5*.qtwebkit: disable a warning to fit log on Hydra
Before > 64 MiB, now ~25 MiB.
2018-02-17 09:45:38 +01:00
Thomas Tuegel fe0ab944db
qt5: factor out common definitions and remove symlink farm
The module definitions are factored out and shared between qt56 and qt59. The
symlink farm which was created during builds is no longer needed.
2017-11-07 07:18:46 -06:00
Renamed from pkgs/development/libraries/qt-5/5.9/qtwebkit/default.nix (Browse further)