qt5: make qt-5.4.1 default

This commit is contained in:
Thomas Tuegel 2015-03-24 10:31:27 -05:00
parent ad49ea230a
commit 5d1f6ad57c
31 changed files with 73 additions and 75 deletions

View file

@ -57,7 +57,7 @@ stdenv.mkDerivation rec {
buildInputs =
[ cmake ]
++ stdenv.lib.optional withQt4 qt4
++ stdenv.lib.optional withQt5 qt5
++ stdenv.lib.optionals withQt5 (with qt5; [ base svg tools ])
++ stdenv.lib.optional withKDE4 kde4.kdelibs
++ stdenv.lib.optionals withTaglib [ taglib taglib_extras ]
++ stdenv.lib.optionals withReplaygain [ ffmpeg speex mpg123 ]

View file

@ -29,7 +29,7 @@ stdenv.mkDerivation rec {
};
# TODO: upgrade libav when "Audio sample format conversion failed" is fixed
buildInputs = [ libav_0_8 libkeyfinder qt5 taglib ];
buildInputs = [ libav_0_8 libkeyfinder qt5.base qt5.xmlpatterns taglib ];
configurePhase = ''
substituteInPlace is_KeyFinder.pro \

View file

@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
buildInputs = [
unzip cmake pkgconfig
hunspell minizip boost xercesc qt5
hunspell minizip boost xercesc qt5.base qt5.tools qt5.webkit qt5.xmlpatterns
];
# XXX: the compiler seems to treat the .h file inappropriately:

View file

@ -19,7 +19,11 @@ stdenv.mkDerivation rec {
NIX_CFLAGS_COMPILE = "-I${ilmbase}/include/OpenEXR";
buildInputs = [ qt5 boost exiv2 fftwFloat gsl ilmbase lcms2 libraw libtiff openexr ];
buildInputs =
[
qt5.base qt5.declarative qt5.tools qt5.webkit
boost exiv2 fftwFloat gsl ilmbase lcms2 libraw libtiff openexr
];
nativeBuildInputs = [ cmake pkgconfig ];

View file

@ -10,7 +10,7 @@ stdenv.mkDerivation rec {
sha256 = "1y59ys1dgjppahs7v7kxwva7ik23s0x7j2f6glv6sn23l9cfq9rp";
};
buildInputs = [ cmake qt5 exiv2 graphicsmagick ];
buildInputs = [ cmake qt5.base qt5.tools exiv2 graphicsmagick ];
patches = [ ./graphicsmagick-path.patch ];

View file

@ -10,7 +10,7 @@ stdenv.mkDerivation rec {
sha256 = "15c18jvgbwyrfhv7r35ih0gzx35vjlsbi984h1sckgh2z17hjq8l";
};
buildInputs = [qt5 cgal boost gmp mpfr flex bison dxflib readline ];
buildInputs = [qt5.base cgal boost gmp mpfr flex bison dxflib readline ];
configurePhase = ''
qmake;

View file

@ -12,10 +12,10 @@ stdenv.mkDerivation rec {
};
patchPhase = ''
sed -i -e '/qmltermwidget/d' cool-retro-term.pro
sed -i -e '/qmltermwidget/d' cool-retro-term.pro
'';
buildInputs = [ makeWrapper qt5 qmltermwidget ];
buildInputs = [ makeWrapper qt5.base qt5.quick1 qmltermwidget ];
configurePhase = "qmake PREFIX=$out";

View file

@ -9,10 +9,14 @@ stdenv.mkDerivation {
};
patches = [ ./robomongo.patch ];
postPatch = ''
rm ./cmake/FindOpenSSL.cmake
'';
NIX_CFLAGS_COMPILE = "-fno-stack-protector";
buildInputs = [ cmake boost scons qt5 openssl python pcre bzip2 ];
buildInputs = [ cmake boost scons qt5.base openssl python pcre bzip2 ];
meta = {
homepage = "http://robomongo.org/";

View file

@ -9,7 +9,7 @@ stdenv.mkDerivation rec {
sha256 = "9c91e9d3d6d7f9d90d34da6f1a4b9f3dee65605c1e43729417d6921c54dded6b";
};
buildInputs = [ qt5 pkgconfig boost ];
buildInputs = [ qt5.base qt5.x11extras pkgconfig boost ];
configurePhase = ''
sed -i s/-Werror// twmnd/twmnd.pro

View file

@ -28,7 +28,12 @@ in stdenv.mkDerivation rec {
sha256 = "0a7zkhl4w2r5ifzs7vwws2lpplp6q5c4jllyf4ld64njgiz6jzip";
};
buildInputs = [ pkgconfig libtoxcore qt5 openalSoft opencv libsodium filteraudio libXScrnSaver ];
buildInputs =
[
libtoxcore openalSoft opencv libsodium filteraudio
qt5.base qt5.tools libXScrnSaver
];
nativeBuildInputs = [ pkgconfig ];
configurePhase = "qmake";

View file

@ -12,7 +12,7 @@ let
deps =
[ zlib glib libpng freetype xorg.libSM xorg.libICE xorg.libXrender
xorg.libXrandr xorg.libXfixes xorg.libXcursor xorg.libXinerama
xlibs.libxcb fontconfig xorg.libXext xorg.libX11 alsaLib qt5 pulseaudio
xlibs.libxcb fontconfig xorg.libXext xorg.libX11 alsaLib qt5.base pulseaudio
];
in

View file

@ -9,7 +9,7 @@ stdenv.mkDerivation rec {
sha256 = "1asrq1v6vjzxd2zz92brdfs5f5b1qf8zwd7k2dpg3dl4shl8wwg5";
};
buildInputs = [ cmake freetype libpng mesa gettext openssl qt5 perl libiconv ];
buildInputs = [ cmake freetype libpng mesa gettext openssl qt5.base qt5.quick1 perl libiconv ];
enableParallelBuilding = true;

View file

@ -14,10 +14,11 @@ stdenv.mkDerivation rec {
tar xjf ${src}
'';
buildInputs = [ qt5 boost ];
buildInputs = [ qt5.base qt5.svg boost ];
configurePhase = ''
cd fritzing-${version}.source
echo $PATH
qmake PREFIX=$out phoenix.pro
'';

View file

@ -42,7 +42,8 @@ stdenv.mkDerivation rec {
};
buildInputs = with stdenv.lib;
[ libX11 libxcb qt5 mesa
[ libX11 libxcb mesa
qt5.base qt5.quick1 qt5.x11extras
ffmpeg
libchardet
mpg123

View file

@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
sha256 = "1057py3j2flzxyiks031s0mwm9h82v033iqn5cq8sycmrb3ihj2s";
};
buildInputs = [ pkgconfig qt5 libarchive ];
buildInputs = [ pkgconfig qt5.base qt5.webkit libarchive ];
patchPhase = ''
substituteInPlace src/main.cpp \

View file

@ -11,8 +11,9 @@ stdenv.mkDerivation {
name = "startkde-0.1";
phases = "installPhase";
inherit bash gnused gnugrep kconfig kinit kservice qt5 socat;
inherit bash gnused gnugrep kconfig kinit kservice socat;
inherit (xorg) mkfontdir xmessage xprop xrdb xset xsetroot;
qt5 = qt5.base;
dbus_tools = dbus.tools;
plasmaWorkspace = plasma-workspace;
plasmaDesktop = plasma-desktop;

View file

@ -593,7 +593,7 @@ self: super: {
vivid = markBroken super.vivid;
# Test suite wants to connect to $DISPLAY.
hsqml = dontCheck super.hsqml;
hsqml = dontCheck (super.hsqml.override { qt5 = pkgs.qt53; });
# https://github.com/megantti/rtorrent-rpc/issues/1
rtorrent-rpc = markBroken super.rtorrent-rpc;

View file

@ -19,7 +19,7 @@ stdenv.mkDerivation rec {
maintainers = with maintainers; [ nckx ];
};
buildInputs = [ fftw qt5 ];
buildInputs = [ fftw qt5.base ];
propagatedBuildInputs = [ boost ];
patchPhase = ''

View file

@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
sha256 = "16b3mmsf9r1yqqaw89fx0c3bgfg86dz4phry89wqy2hw05szgda3";
};
buildInputs = [ opencv qt5 ];
buildInputs = [ opencv qt5.base qt5.svg ];
nativeBuildInputs = [ cmake ];

View file

@ -1,7 +1,4 @@
{ stdenv, fetchurl, cmake, automoc4, pulseaudio
, qt4 ? null, qt5 ? null, withQt5 ? false }:
assert (withQt5 -> qt5 != null); assert (!withQt5 -> qt4 != null);
{ stdenv, fetchurl, cmake, automoc4, pulseaudio, qt4 }:
with stdenv.lib;
@ -17,12 +14,10 @@ stdenv.mkDerivation rec {
sha256 = "1l97h1jj3gvl1chx1qbipizfvjgqc05wrhdcflc76c2krlk03jmn";
};
buildInputs = [ (if withQt5 then qt5 else qt4) pulseaudio ];
buildInputs = [ qt4 pulseaudio ];
nativeBuildInputs = [ cmake automoc4 ];
cmakeFlags = optional withQt5 "-DPHONON_BUILD_PHONON4QT5=ON";
meta = {
homepage = http://phonon.kde.org/;
description = "Multimedia API for Qt";

View file

@ -10,7 +10,7 @@ stdenv.mkDerivation rec {
sha256 = "19pz27jsdpa3pybj8sghmmd1zqgr73js1mp3875rhx158dav37nz";
};
buildInputs = [ qt5 ];
buildInputs = [ qt5.base qt5.quick1 ];
patchPhase = ''
substituteInPlace qmltermwidget.pro \
@ -20,7 +20,7 @@ stdenv.mkDerivation rec {
configurePhase = "qmake PREFIX=$out";
installPhase=''make INSTALL_ROOT="$out" install'';
enableParallelBuilding = true;
meta = {

View file

@ -20,9 +20,11 @@ mkDerivation (args // {
dontFixLibtool = args.dontFixLibtool or true;
configureScript = args.configureScript or "qmake";
/*
preConfigure = ''
export PATH="$out/bin:$PATH"
'';
*/
postInstall = ''
rm "$out/bin/qmake" "$out/bin/qt.conf"

View file

@ -28,15 +28,15 @@ addQtModule() {
propagatedBuildInputs+=" $1"
fi
if [[ -f "$1/bin/qmake" ]]; then
addToSearchPath PATH "$qtOut/bin"
fi
if [[ -d "$1/lib/qt5/qml" ]] || [[ -d "$1/lib/qt5/plugins" ]] || [[ -d "$1/lib/qt5/imports" ]]; then
propagatedUserEnvPkgs+=" $1"
fi
}
setQMakePath() {
export PATH="$qtOut/bin${PATH:+:}$PATH"
}
qtOut=""
if [[ -z $qtSubmodule ]]; then
qtOut="$PWD/qmake-$name"
@ -56,3 +56,4 @@ Qml2Imports = $qtOut/lib/qt5/qml
EOF
envHooks+=(addQtModule)
preConfigurePhases+=" setQMakePath"

View file

@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
installFlags = "INSTALL_ROOT=$(out)";
buildInputs = [ zlib qt ];
buildInputs = [ zlib qt.base ];
meta = {
description = "Provides access to ZIP archives from Qt programs";

View file

@ -39,7 +39,7 @@ stdenv.mkDerivation rec {
buildInputs = [
freeglut freealut mesa libICE libjpeg openal openscenegraph plib
libSM libunwind libX11 xproto libXext xextproto libXi inputproto
libXmu libXt simgear zlib boost cmake libpng udev fltk13 apr qt5
libXmu libXt simgear zlib boost cmake libpng udev fltk13 apr qt5.base
];
preConfigure = ''

View file

@ -9,7 +9,7 @@ stdenv.mkDerivation rec {
sha256 = "08fhqd323kgz5s17ac5z9dhkjxcmwvcmvhzy0x1vw4rayhijfrd7";
};
buildInputs = [ pkgs.unzip qt5 lua5_1 hunspell libzip yajl boost makeWrapper luafilesystem luazip lrexlib luasqlite3 ];
buildInputs = [ pkgs.unzip qt5.base lua5_1 hunspell libzip yajl boost makeWrapper luafilesystem luazip lrexlib luasqlite3 ];
configurePhase = "cd src && qmake";

View file

@ -33,7 +33,7 @@ stdenv.mkDerivation rec {
++ lib.optional withTeXLive texLive
++ lib.optional withLua lua
++ lib.optionals withX [ libX11 libXpm libXt libXaw ]
++ lib.optional withQt [ qt ]
++ lib.optional withQt [ qt.base ]
# compiling with wxGTK causes a malloc (double free) error on darwin
++ lib.optional (withWxGTK && !stdenv.isDarwin) wxGTK;

View file

@ -9,7 +9,7 @@ stdenv.mkDerivation rec {
};
nativeBuildInputs = [ cmake pkgconfig ];
buildInputs = [ qt5 gsl getdata netcdf muparser matio ];
buildInputs = [ qt5.base gsl getdata netcdf muparser matio ];
cmakeFlags = "-Dkst_qt5=1 -Dkst_release=1";

View file

@ -9,7 +9,7 @@ stdenv.mkDerivation rec {
sha256 = "070rxv3kyn41ra7nnk1wbqvy6fjg38h7hrdv4dn71b201kmzd194";
};
buildInputs = [ qt5 makeWrapper ];
buildInputs = [ qt5.base makeWrapper ];
configurePhase = ''
substituteInPlace ./cmst.pro \

View file

@ -6084,9 +6084,7 @@ let
automake = automake111x;
};
kf57 = recurseIntoAttrs (callPackage ../development/libraries/kde-frameworks-5.7 {
qt5 = qt54;
});
kf57 = recurseIntoAttrs (callPackage ../development/libraries/kde-frameworks-5.7 { });
kf5_latest = kf57;
kf5_stable = kf57;
@ -6225,9 +6223,7 @@ let
};
libdbusmenu_qt = callPackage ../development/libraries/libdbusmenu-qt { };
libdbusmenu_qt5 = callPackage ../development/libraries/libdbusmenu-qt/qt5.nix {
qt5 = qt54;
};
libdbusmenu_qt5 = callPackage ../development/libraries/libdbusmenu-qt/qt5.nix { };
libdc1394 = callPackage ../development/libraries/libdc1394 { };
@ -6942,7 +6938,7 @@ let
};
mlt-qt5 = callPackage ../development/libraries/mlt {
qt = qt5;
qt = qt53;
};
movit = callPackage ../development/libraries/movit { };
@ -7122,21 +7118,12 @@ let
pdf2xml = callPackage ../development/libraries/pdf2xml {} ;
phonon = callPackage ../development/libraries/phonon/qt4 {};
phonon_backend_gstreamer = callPackage ../development/libraries/phonon-backend-gstreamer/qt4 {};
phonon_backend_vlc = callPackage ../development/libraries/phonon-backend-vlc/qt4 {};
phonon_qt5 = callPackage ../development/libraries/phonon/qt5 {
qt5 = qt54;
};
phonon_qt5_backend_gstreamer = callPackage ../development/libraries/phonon-backend-gstreamer/qt5 {
qt5 = qt54;
};
phonon_qt5_backend_vlc = callPackage ../development/libraries/phonon-backend-vlc/qt5 {
qt5 = qt54;
};
phonon_qt5 = callPackage ../development/libraries/phonon/qt5 { };
phonon_qt5_backend_gstreamer = callPackage ../development/libraries/phonon-backend-gstreamer/qt5 { };
phonon_qt5_backend_vlc = callPackage ../development/libraries/phonon-backend-vlc/qt5 { };
physfs = callPackage ../development/libraries/physfs { };
@ -7162,12 +7149,11 @@ let
polkit_qt5 = callPackage ../development/libraries/polkit-qt-1 {
withQt5 = true;
qt5 = qt54;
};
policykit = callPackage ../development/libraries/policykit { };
poppler = callPackage ../development/libraries/poppler { lcms = lcms2; qt5 = qt54; };
poppler = callPackage ../development/libraries/poppler { lcms = lcms2; };
popplerQt4 = poppler.poppler_qt4;
poppler_qt5 = poppler.poppler_qt5;
@ -7241,7 +7227,7 @@ let
qtLib = qt48Full;
};
qt5 = callPackage ../development/libraries/qt-5/5.3 {
qt53 = callPackage ../development/libraries/qt-5/5.3 {
mesa = mesa_noglu;
cups = if stdenv.isLinux then cups else null;
# GNOME dependencies are not used unless gtkStyle == true
@ -7251,7 +7237,9 @@ let
qt54 = callPackage ../development/libraries/qt-5/5.4 {};
qt5Full = appendToName "full" (qt5.override {
qt5 = qt54;
qt5Full = appendToName "full" (qt53.override {
buildDocs = true;
buildExamples = true;
buildTests = true;
@ -9904,6 +9892,7 @@ let
calibre = callPackage ../applications/misc/calibre {
inherit (pythonPackages) pyqt5 sip_4_16;
qt5 = qt53; # depends on pyqt5
};
camlistore = callPackage ../applications/misc/camlistore { };
@ -10568,7 +10557,7 @@ let
libquvi = callPackage ../applications/video/quvi/library.nix { };
linssid = callPackage ../applications/networking/linssid { };
linssid = callPackage ../applications/networking/linssid { qt5 = qt53; };
mi2ly = callPackage ../applications/audio/mi2ly {};
@ -10821,7 +10810,6 @@ let
kdeApps_14_12 = recurseIntoAttrs (callPackage ../applications/kde-apps-14.12 {
kf5 = kf57;
qt5 = qt54;
inherit pkgs;
kde4 = kde4.override { inherit (kdeApps_14_12) kdelibs; };
});
@ -11164,7 +11152,7 @@ let
pcmanfm = callPackage ../applications/misc/pcmanfm { };
shotcut = callPackage ../applications/video/shotcut { mlt = mlt-qt5; };
shotcut = callPackage ../applications/video/shotcut { mlt = mlt-qt5; qt5 = qt53; };
smplayer = callPackage ../applications/video/smplayer { };
@ -11414,7 +11402,7 @@ let
client = false;
withKDE = false;
useQt5 = true;
qt = qt54;
qt = qt5;
dconf = gnome3.dconf;
tag = "-qt5";
};
@ -11584,9 +11572,7 @@ let
copy-com = callPackage ../applications/networking/copy-com { };
dropbox = callPackage ../applications/networking/dropbox {
qt5 = qt54;
};
dropbox = callPackage ../applications/networking/dropbox { };
dropbox-cli = callPackage ../applications/networking/dropbox-cli { };
@ -11607,9 +11593,7 @@ let
printrun = callPackage ../applications/misc/printrun { };
sddm = callPackage ../applications/display-managers/sddm {
qt5 = qt54;
};
sddm = callPackage ../applications/display-managers/sddm { };
slim = callPackage ../applications/display-managers/slim {
libpng = libpng12;
@ -11635,6 +11619,7 @@ let
inherit (pkgs.vamp) vampSDK;
inherit (pkgs.xlibs) libX11;
fftw = pkgs.fftwSinglePrec;
qt5 = qt53;
};
sox = callPackage ../applications/misc/audio/sox { };
@ -11979,7 +11964,6 @@ let
vlc_qt5 = vlc.override {
qt4 = null;
qt5 = qt54;
withQt5 = true;
};
@ -13027,7 +13011,6 @@ let
numix-gtk-theme = callPackage ../misc/themes/gtk3/numix-gtk-theme { };
plasma52 = recurseIntoAttrs (callPackage ../desktops/plasma-5.2 {
qt5 = qt54;
kf5 = kf57;
});
plasma5_latest = plasma52;

View file

@ -151,6 +151,7 @@ let
pyqt5 = callPackage ../development/python-modules/pyqt/5.x.nix {
sip = self.sip_4_16;
pythonDBus = self.dbus;
qt5 = pkgs.qt53;
};
sip = callPackage ../development/python-modules/sip { };