commit 6f380466ce423eed5f5dfd8d554c0256d9141646

tjh.dev / nixpkgs

Clone of https://github.com/NixOS/nixpkgs.git (to stress-test knotserver)

fork atom

qt5.qtwebkit: don't set qmake variables for cmake build

(cherry picked from commit 518f997eb5a893bdc16a8f18f0b1e98b895f49a9)

Dmitry Kalinkin 7 years ago 6f380466 91f2dc0a

+1 -1

1 changed file

expand all

unified split

pkgs

development

libraries

qt-5

modules

qtwebkit.nix

+1 -1

pkgs/development/libraries/qt-5/modules/qtwebkit.nix

··· 43 43 44 44 # QtWebKit overrides qmake's default_pre and default_post features, 45 45 # so its custom qmake files must be found first at the front of QMAKEPATH. 46 - preConfigure = '' 46 + preConfigure = stdenv.lib.optionalString (!usingAnnulenWebkitFork) '' 47 47 QMAKEPATH="$PWD/Tools/qmake''${QMAKEPATH:+:}$QMAKEPATH" 48 48 fixQtBuiltinPaths . '*.pr?' 49 49 # Fix hydra's "Log limit exceeded"