diff options
| author | github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> | 2021-02-09 06:16:02 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-02-09 06:16:02 +0000 |
| commit | 30dddce5e8f91bc259277edb0425f196a842e427 (patch) | |
| tree | a2b48959e8a83f9c059500a0d4b23728bbbcb833 /pkgs/development/libraries/qt-5 | |
| parent | e95bf384292f15ece90ec423faa019f5d3d21e51 (diff) | |
| parent | 50d34017c234ac075298658c77817499aa713d58 (diff) | |
| download | nixpkgs-30dddce5e8f91bc259277edb0425f196a842e427.tar nixpkgs-30dddce5e8f91bc259277edb0425f196a842e427.tar.gz nixpkgs-30dddce5e8f91bc259277edb0425f196a842e427.tar.bz2 nixpkgs-30dddce5e8f91bc259277edb0425f196a842e427.tar.lz nixpkgs-30dddce5e8f91bc259277edb0425f196a842e427.tar.xz nixpkgs-30dddce5e8f91bc259277edb0425f196a842e427.tar.zst nixpkgs-30dddce5e8f91bc259277edb0425f196a842e427.zip | |
Merge master into staging-next
Diffstat (limited to 'pkgs/development/libraries/qt-5')
| -rw-r--r-- | pkgs/development/libraries/qt-5/modules/qtwebkit.nix | 9 |
1 files changed, 1 insertions, 8 deletions
diff --git a/pkgs/development/libraries/qt-5/modules/qtwebkit.nix b/pkgs/development/libraries/qt-5/modules/qtwebkit.nix index ed41a4ac9bc..288a0e30f69 100644 --- a/pkgs/development/libraries/qt-5/modules/qtwebkit.nix +++ b/pkgs/development/libraries/qt-5/modules/qtwebkit.nix @@ -1,10 +1,9 @@ { qtModule, stdenv, lib, fetchurl , qtbase, qtdeclarative, qtlocation, qtmultimedia, qtsensors, qtwebchannel -, fontconfig, gtk2, libwebp, libxml2, libxslt +, fontconfig, libwebp, libxml2, libxslt , sqlite, systemd, glib, gst_all_1, cmake , bison, flex, gdb, gperf, perl, pkg-config, python2, ruby , darwin -, flashplayerFix ? false }: let @@ -58,12 +57,6 @@ qtModule { ++ optional stdenv.cc.isGNU "-Wno-class-memaccess" # with clang this warning blows the log over Hydra's limit ++ optional stdenv.isDarwin "-Wno-inconsistent-missing-override" - ++ optionals flashplayerFix - [ - ''-DNIXPKGS_LIBGTK2="${getLib gtk2}/lib/libgtk-x11-2.0"'' - # this file used to exist in gdk_pixbuf? - ''-DNIXPKGS_LIBGDK2="${getLib gtk2}/lib/libgdk-x11-2.0"'' - ] ++ optional (!stdenv.isDarwin) ''-DNIXPKGS_LIBUDEV="${getLib systemd}/lib/libudev"''; doCheck = false; # fails 13 out of 13 tests (ctest) |