diff options
| author | adisbladis <adisbladis@gmail.com> | 2019-11-11 23:30:24 +0000 |
|---|---|---|
| committer | adisbladis <adisbladis@gmail.com> | 2019-11-18 20:10:43 +0000 |
| commit | dcfc821c6c4294db933dfee0b7de25d856ff49c2 (patch) | |
| tree | 11ccf0f864a49e3e6a4d5eb1a8df2b4e74ea67b3 /pkgs/applications | |
| parent | c9d8624ccddf17aee28745446b6763aabb26b4c7 (diff) | |
treewide: Stop using Qt 5.9
Diffstat (limited to 'pkgs/applications')
| -rw-r--r-- | pkgs/applications/misc/merkaartor/default.nix | 5 | ||||
| -rw-r--r-- | pkgs/applications/version-management/bcompare/default.nix | 2 |
2 files changed, 4 insertions, 3 deletions
diff --git a/pkgs/applications/misc/merkaartor/default.nix b/pkgs/applications/misc/merkaartor/default.nix index 3023a5b5930ca..149546e46d2fd 100644 --- a/pkgs/applications/misc/merkaartor/default.nix +++ b/pkgs/applications/misc/merkaartor/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchFromGitHub, makeWrapper, qmake, pkgconfig, boost, gdal, proj -, qtbase, qtsvg, qtwebkit }: +, qtbase, qtsvg, qtwebview, qtwebkit }: stdenv.mkDerivation rec { pname = "merkaartor"; @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ makeWrapper qmake pkgconfig ]; - buildInputs = [ boost gdal proj qtbase qtsvg qtwebkit ]; + buildInputs = [ boost gdal proj qtbase qtsvg qtwebview qtwebkit ]; enableParallelBuilding = true; @@ -30,5 +30,6 @@ stdenv.mkDerivation rec { homepage = http://merkaartor.be/; license = licenses.gpl2Plus; maintainers = with maintainers; [ ]; + broken = true; # Does not build with qt >= 5.12 }; } diff --git a/pkgs/applications/version-management/bcompare/default.nix b/pkgs/applications/version-management/bcompare/default.nix index 8f862af0a282e..d8a6ec058448a 100644 --- a/pkgs/applications/version-management/bcompare/default.nix +++ b/pkgs/applications/version-management/bcompare/default.nix @@ -1,4 +1,4 @@ -{ autoPatchelfHook, bzip2, cairo, coreutils, fetchurl, gdk-pixbuf, gnome2, gtk2, kcoreaddons, ki18n, kio, kservice, lib, qt4, qt511, qtbase, stdenv, runtimeShell }: +{ autoPatchelfHook, bzip2, cairo, coreutils, fetchurl, gdk-pixbuf, gnome2, gtk2, kcoreaddons, ki18n, kio, kservice, lib, qt4, qtbase, stdenv, runtimeShell }: stdenv.mkDerivation rec { pname = "bcompare"; |