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

qt56: remove; unused, broken with openssl 1.1

Browse Source
This commit is contained in:
Robin Gloster
2019-08-22 14:50:28 +02:00
parent 37aad44132
commit 3dede565c7
13 changed files with 2 additions and 1640 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkgs/development/libraries/qt-5/modules/qtwebengine.nix
+2 -5
View File
@@ -20,8 +20,6 @@
with stdenv.lib;
let qt56 = qtCompatVersion == "5.6"; in
qtModule {
name = "qtwebengine";
qtInputs = [ qtdeclarative qtquickcontrols qtlocation qtwebchannel ];
@@ -48,9 +46,9 @@ qtModule {
# Patch Chromium build files
+ optionalString (lib.versionOlder qtCompatVersion "5.12") ''
substituteInPlace ./src/3rdparty/chromium/build/common.gypi --replace /bin/echo ${coreutils}/bin/echo
substituteInPlace ./src/3rdparty/chromium/v8/${if qt56 then "build" else "gypfiles"}/toolchain.gypi \
substituteInPlace ./src/3rdparty/chromium/v8/gypfiles/toolchain.gypi \
--replace /bin/echo ${coreutils}/bin/echo
substituteInPlace ./src/3rdparty/chromium/v8/${if qt56 then "build" else "gypfiles"}/standalone.gypi \
substituteInPlace ./src/3rdparty/chromium/v8/gypfiles/standalone.gypi \
--replace /bin/echo ${coreutils}/bin/echo
''
# Patch library paths in Qt sources
@@ -219,7 +217,6 @@ EOF
description = "A web engine based on the Chromium web browser";
maintainers = with maintainers; [ matthewbauer ];
platforms = platforms.unix;
broken = qt56; # 2018-09-13, no successful build since 2018-04-25
};
}