cafkafk/nixpkgs
cafkafk/nixpkgs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 2

qtwebkit: build with bison3

Browse source
This commit is contained in:
Luka Blaskovic 2020-01-06 11:16:49 +00:00
parent e2717ad9b7
commit 81d778466c
1 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
pkgs/development/libraries/qt-5/modules/qtwebkit.nix
View file

@ -2,7 +2,7 @@
, qtbase, qtdeclarative, qtlocation, qtmultimedia, qtsensors, qtwebchannel , qtbase, qtdeclarative, qtlocation, qtmultimedia, qtsensors, qtwebchannel
, fontconfig, gtk2, libwebp, libxml2, libxslt , fontconfig, gtk2, libwebp, libxml2, libxslt
, sqlite, systemd, glib, gst_all_1, cmake , sqlite, systemd, glib, gst_all_1, cmake
, bison2, flex, gdb, gperf, perl, pkgconfig, python2, ruby , bison, flex, gdb, gperf, perl, pkgconfig, python2, ruby
, darwin , darwin
, flashplayerFix ? false , flashplayerFix ? false
}: }:
@ -31,7 +31,7 @@ qtModule {
++ optionals (stdenv.isDarwin) (with darwin; with apple_sdk.frameworks; [ ICU OpenGL ]) ++ optionals (stdenv.isDarwin) (with darwin; with apple_sdk.frameworks; [ ICU OpenGL ])
++ optional usingAnnulenWebkitFork hyphen; ++ optional usingAnnulenWebkitFork hyphen;
nativeBuildInputs = [ nativeBuildInputs = [
bison2 flex gdb gperf perl pkgconfig python2 ruby bison flex gdb gperf perl pkgconfig python2 ruby
] ++ optional usingAnnulenWebkitFork cmake; ] ++ optional usingAnnulenWebkitFork cmake;
cmakeFlags = optionals usingAnnulenWebkitFork ([ "-DPORT=Qt" ] cmakeFlags = optionals usingAnnulenWebkitFork ([ "-DPORT=Qt" ]