diff options
| author | Matthew Bauer <mjbauer95@gmail.com> | 2018-04-24 23:18:35 -0500 |
|---|---|---|
| committer | Matthew Bauer <mjbauer95@gmail.com> | 2018-04-24 23:57:46 -0500 |
| commit | ec632b745fb72e5070983dd3dff78ed81466243d (patch) | |
| tree | a5c8d6c2e74538cc771344a977760f8d6cf67eeb /pkgs/development/libraries/qt-5/mkDerivation.nix | |
| parent | b87cb29d1be6a7729199aa33a5f0e5fd5f9801ef (diff) | |
| download | nixpkgs-ec632b745fb72e5070983dd3dff78ed81466243d.tar nixpkgs-ec632b745fb72e5070983dd3dff78ed81466243d.tar.gz nixpkgs-ec632b745fb72e5070983dd3dff78ed81466243d.tar.bz2 nixpkgs-ec632b745fb72e5070983dd3dff78ed81466243d.tar.lz nixpkgs-ec632b745fb72e5070983dd3dff78ed81466243d.tar.xz nixpkgs-ec632b745fb72e5070983dd3dff78ed81466243d.tar.zst nixpkgs-ec632b745fb72e5070983dd3dff78ed81466243d.zip | |
qtwebengine: rewrite
Fixes #39334 and Fixes #36729 Also, Fixes #36932 (hopefully it's still building) (This might be able to be able to be cherry-picked to 18.03 but be careful - chromium is extremely touchy. Probably best to wait for it to be built successfully on Hydra a few times.)
Diffstat (limited to 'pkgs/development/libraries/qt-5/mkDerivation.nix')
| -rw-r--r-- | pkgs/development/libraries/qt-5/mkDerivation.nix | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/pkgs/development/libraries/qt-5/mkDerivation.nix b/pkgs/development/libraries/qt-5/mkDerivation.nix index 739c9b4a160..96014cfbc77 100644 --- a/pkgs/development/libraries/qt-5/mkDerivation.nix +++ b/pkgs/development/libraries/qt-5/mkDerivation.nix @@ -9,9 +9,8 @@ args: let args_ = { - qmakeFlags = - (args.qmakeFlags or []) - ++ [ ("CONFIG+=" + (if debug then "debug" else "release")) ]; + qmakeFlags = [ ("CONFIG+=" + (if debug then "debug" else "release")) ] + ++ (args.qmakeFlags or []); NIX_CFLAGS_COMPILE = optional (!debug) "-DQT_NO_DEBUG" |