public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

qt5.qtwebkit: refactor version comparison

Browse Source 
This introduces usingAnnulenWebkitFork variable. Using version
check for qtbase.version is misleading because annulen's fork is not
tied to a specific qt5 release.
This commit is contained in:
Dmitry Kalinkin 2019-02-17 22:33:32 -05:00
parent f212dd2e32
commit 67186defda
No known key found for this signature in database
GPG Key ID: 5157B3EC8B2CA333
1 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
pkgs/development/libraries/qt-5/modules/qtwebkit.nix
View File

@ -20,20 +20,21 @@ let
''; '';
buildInputs = [ perl ]; buildInputs = [ perl ];
}; };
usingAnnulenWebkitFork = lib.versionAtLeast qtbase.version "5.11.0";
in in
qtModule { qtModule {
name = "qtwebkit"; name = "qtwebkit";
qtInputs = [ qtbase qtdeclarative qtlocation qtsensors ] qtInputs = [ qtbase qtdeclarative qtlocation qtsensors ]
++ optional (stdenv.isDarwin && lib.versionAtLeast qtbase.version "5.9.0") qtmultimedia ++ optional (stdenv.isDarwin && lib.versionAtLeast qtbase.version "5.9.0") qtmultimedia
++ optional (lib.versionAtLeast qtbase.version "5.11.0") qtwebchannel; ++ optional usingAnnulenWebkitFork qtwebchannel;
buildInputs = [ fontconfig libwebp libxml2 libxslt sqlite glib gst_all_1.gstreamer gst_all_1.gst-plugins-base ] buildInputs = [ fontconfig libwebp libxml2 libxslt sqlite glib gst_all_1.gstreamer gst_all_1.gst-plugins-base ]
++ optionals (stdenv.isDarwin) (with darwin; with apple_sdk.frameworks; [ cf-private ICU OpenGL ]) ++ optionals (stdenv.isDarwin) (with darwin; with apple_sdk.frameworks; [ cf-private ICU OpenGL ])
++ optionals (lib.versionAtLeast qtbase.version "5.11.0") [ hyphen ]; ++ optional usingAnnulenWebkitFork hyphen;
nativeBuildInputs = [ nativeBuildInputs = [
bison2 flex gdb gperf perl pkgconfig python2 ruby bison2 flex gdb gperf perl pkgconfig python2 ruby
] ++ optionals (lib.versionAtLeast qtbase.version "5.11.0") [ cmake ]; ] ++ optional usingAnnulenWebkitFork cmake;
cmakeFlags = optionals (lib.versionAtLeast qtbase.version "5.11.0") [ "-DPORT=Qt" ]; cmakeFlags = optional usingAnnulenWebkitFork "-DPORT=Qt";
# QtWebKit overrides qmake's default_pre and default_post features, # QtWebKit overrides qmake's default_pre and default_post features,
# so its custom qmake files must be found first at the front of QMAKEPATH. # so its custom qmake files must be found first at the front of QMAKEPATH.