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

treewide: Stop using Qt 5.9

Browse Source
This commit is contained in:
adisbladis 2019-11-11 23:30:24 +00:00
parent c9d8624ccd
commit dcfc821c6c
No known key found for this signature in database
GPG Key ID: 110BFAD44C6249B7
5 changed files with 18 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
pkgs/applications/misc/merkaartor/default.nix
View File

@ -1,5 +1,5 @@
{ stdenv, fetchFromGitHub, makeWrapper, qmake, pkgconfig, boost, gdal, proj { stdenv, fetchFromGitHub, makeWrapper, qmake, pkgconfig, boost, gdal, proj
, qtbase, qtsvg, qtwebkit }: , qtbase, qtsvg, qtwebview, qtwebkit }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "merkaartor"; pname = "merkaartor";
@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [ makeWrapper qmake pkgconfig ]; nativeBuildInputs = [ makeWrapper qmake pkgconfig ];
buildInputs = [ boost gdal proj qtbase qtsvg qtwebkit ]; buildInputs = [ boost gdal proj qtbase qtsvg qtwebview qtwebkit ];
enableParallelBuilding = true; enableParallelBuilding = true;
@ -30,5 +30,6 @@ stdenv.mkDerivation rec {
homepage = http://merkaartor.be/; homepage = http://merkaartor.be/;
license = licenses.gpl2Plus; license = licenses.gpl2Plus;
maintainers = with maintainers; [ ]; maintainers = with maintainers; [ ];
broken = true; # Does not build with qt >= 5.12
}; };
} }

2
pkgs/applications/version-management/bcompare/default.nix
View File

@ -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 { stdenv.mkDerivation rec {
pname = "bcompare"; pname = "bcompare";

7
pkgs/development/ruby-modules/gem-config/default.nix
View File

@ -21,7 +21,7 @@
, libiconv, postgresql, v8, clang, sqlite, zlib, imagemagick , libiconv, postgresql, v8, clang, sqlite, zlib, imagemagick
, pkgconfig , ncurses, xapian, gpgme, utillinux, tzdata, icu, libffi , pkgconfig , ncurses, xapian, gpgme, utillinux, tzdata, icu, libffi
, cmake, libssh2, openssl, libmysqlclient, darwin, git, perl, pcre, gecode_3, curl , cmake, libssh2, openssl, libmysqlclient, darwin, git, perl, pcre, gecode_3, curl
, msgpack, qt59, libsodium, snappy, libossp_uuid, lxc, libpcap, xorg, gtk2, buildRubyGem , msgpack, libsodium, snappy, libossp_uuid, lxc, libpcap, xorg, gtk2, buildRubyGem
, cairo, re2, rake, gobject-introspection, gdk-pixbuf, zeromq, czmq, graphicsmagick, libcxx , cairo, re2, rake, gobject-introspection, gdk-pixbuf, zeromq, czmq, graphicsmagick, libcxx
, file, libvirt, glib, vips, taglib, libopus, linux-pam, libidn, protobuf, fribidi, harfbuzz , file, libvirt, glib, vips, taglib, libopus, linux-pam, libidn, protobuf, fribidi, harfbuzz
, bison, flex, pango, python3, patchelf, binutils, freetds, wrapGAppsHook, atk , bison, flex, pango, python3, patchelf, binutils, freetds, wrapGAppsHook, atk
@ -70,11 +70,6 @@ in
buildInputs = [ cairo pcre xorg.libpthreadstubs xorg.libXdmcp ]; buildInputs = [ cairo pcre xorg.libpthreadstubs xorg.libXdmcp ];
}; };
capybara-webkit = attrs: {
buildInputs = [ qt59.qtbase qt59.qtwebkit ] ++ stdenv.lib.optionals stdenv.isDarwin [ darwin.apple_sdk.frameworks.Cocoa ];
NIX_CFLAGS_COMPILE = stdenv.lib.optionalString stdenv.isDarwin "-I${libcxx}/include/c++/v1";
};
charlock_holmes = attrs: { charlock_holmes = attrs: {
buildInputs = [ which icu zlib ]; buildInputs = [ which icu zlib ];
}; };

7
pkgs/tools/graphics/nifskope/default.nix
View File

@ -1,4 +1,4 @@
{ stdenv, fetchFromGitHub, qmake, qtbase, qttools, substituteAll, libGLU, wrapQtAppsHook }: { stdenv, fetchFromGitHub, qmake, qtbase, qttools, substituteAll, libGLU, wrapQtAppsHook, fetchpatch }:
stdenv.mkDerivation { stdenv.mkDerivation {
pname = "nifskope"; pname = "nifskope";
@ -18,6 +18,11 @@ stdenv.mkDerivation {
src = ./qttools-bins.patch; src = ./qttools-bins.patch;
qttools = "${qttools.dev}/bin"; qttools = "${qttools.dev}/bin";
}) })
(fetchpatch {
name = "qt512-build-fix.patch";
url = "https://github.com/niftools/nifskope/commit/30954e7f01f3d779a2a1fd37d363e8a6ad560bd3.patch";
sha256 = "0d6xjj2mjjhdd7w1aig5f75jksjni16jyj0lxsz51pys6xqb6fpj";
})
]; ];
buildInputs = [ qtbase qttools libGLU.dev ]; buildInputs = [ qtbase qttools libGLU.dev ];

17
pkgs/top-level/all-packages.nix
View File

@ -5213,7 +5213,7 @@ in
niff = callPackage ../tools/package-management/niff { }; niff = callPackage ../tools/package-management/niff { };
nifskope = libsForQt59.callPackage ../tools/graphics/nifskope { }; nifskope = libsForQt5.callPackage ../tools/graphics/nifskope { };
nilfs-utils = callPackage ../tools/filesystems/nilfs-utils {}; nilfs-utils = callPackage ../tools/filesystems/nilfs-utils {};
@ -9853,7 +9853,7 @@ in
funnelweb = callPackage ../development/tools/literate-programming/funnelweb { }; funnelweb = callPackage ../development/tools/literate-programming/funnelweb { };
gede = libsForQt59.callPackage ../development/tools/misc/gede { }; gede = libsForQt5.callPackage ../development/tools/misc/gede { };
gdbgui = python3Packages.callPackage ../development/tools/misc/gdbgui { }; gdbgui = python3Packages.callPackage ../development/tools/misc/gdbgui { };
@ -13482,10 +13482,7 @@ in
python-qt = callPackage ../development/libraries/python-qt { python-qt = callPackage ../development/libraries/python-qt {
python = python27; python = python27;
qmake = qt59.qmake; inherit (qt5) qmake qttools qtwebengine qtxmlpatterns;
qttools = qt59.qttools;
qtwebengine = qt59.qtwebengine;
qtxmlpatterns = qt59.qtxmlpatterns;
}; };
pyotherside = libsForQt5.callPackage ../development/libraries/pyotherside {}; pyotherside = libsForQt5.callPackage ../development/libraries/pyotherside {};
@ -18164,7 +18161,7 @@ in
pygments = python27Packages.pygments; pygments = python27Packages.pygments;
}; };
csound-qt = libsForQt59.callPackage ../applications/audio/csound/csound-qt { csound-qt = libsForQt5.callPackage ../applications/audio/csound/csound-qt {
python = python27; python = python27;
}; };
@ -19853,7 +19850,7 @@ in
mercurialFull = appendToName "full" (pkgs.mercurial.override { guiSupport = true; }); mercurialFull = appendToName "full" (pkgs.mercurial.override { guiSupport = true; });
merkaartor = libsForQt59.callPackage ../applications/misc/merkaartor { merkaartor = libsForQt5.callPackage ../applications/misc/merkaartor {
gdal = gdal_2; # https://github.com/openstreetmap/merkaartor/issues/179 gdal = gdal_2; # https://github.com/openstreetmap/merkaartor/issues/179
}; };
@ -20562,7 +20559,7 @@ in
gtksharp = gtk-sharp-2_0; gtksharp = gtk-sharp-2_0;
}; };
plex-media-player = libsForQt59.callPackage ../applications/video/plex-media-player { }; plex-media-player = libsForQt5.callPackage ../applications/video/plex-media-player { };
plover = recurseIntoAttrs (libsForQt5.callPackage ../applications/misc/plover { }); plover = recurseIntoAttrs (libsForQt5.callPackage ../applications/misc/plover { });
@ -22462,7 +22459,7 @@ in
chessdb = callPackage ../games/chessdb { }; chessdb = callPackage ../games/chessdb { };
chessx = libsForQt59.callPackage ../games/chessx { }; chessx = libsForQt5.callPackage ../games/chessx { };
chiaki = libsForQt5.callPackage ../games/chiaki { }; chiaki = libsForQt5.callPackage ../games/chiaki { };