diff options
11 files changed, 18 insertions, 20 deletions
diff --git a/pkgs/applications/audio/musescore/default.nix b/pkgs/applications/audio/musescore/default.nix index 7d4768d23324..9dbebe31a38e 100644 --- a/pkgs/applications/audio/musescore/default.nix +++ b/pkgs/applications/audio/musescore/default.nix @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { }; buildInputs = [ - makeWrapper cmake qt5 pkgconfig alsaLib portaudio jack2 lame libsndfile libvorbis + makeWrapper cmake qt5.base pkgconfig alsaLib portaudio jack2 lame libsndfile libvorbis ]; patchPhase = '' diff --git a/pkgs/applications/audio/sonic-visualiser/default.nix b/pkgs/applications/audio/sonic-visualiser/default.nix index 7bda4fb27670..104a458d6a06 100644 --- a/pkgs/applications/audio/sonic-visualiser/default.nix +++ b/pkgs/applications/audio/sonic-visualiser/default.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { }; buildInputs = - [ libsndfile qt5 fftw /* should be fftw3f ??*/ bzip2 librdf rubberband + [ libsndfile qt5.base fftw /* should be fftw3f ??*/ bzip2 librdf rubberband libsamplerate vampSDK alsaLib librdf_raptor librdf_rasqal redland serd sord diff --git a/pkgs/applications/display-managers/lightdm/default.nix b/pkgs/applications/display-managers/lightdm/default.nix index 79163945c0ce..8a613ee68617 100644 --- a/pkgs/applications/display-managers/lightdm/default.nix +++ b/pkgs/applications/display-managers/lightdm/default.nix @@ -17,15 +17,15 @@ stdenv.mkDerivation rec { buildInputs = [ pkgconfig pam libxcb glib libXdmcp itstool libxml2 intltool libxklavier libgcrypt - qt4 qt5 - ]; + qt4 + ] ++ stdenv.lib.optional (qt5 != null) qt5.base; configureFlags = [ "--enable-liblightdm-gobject" "--localstatedir=/var" "--sysconfdir=/etc" ] ++ stdenv.lib.optional (qt4 != null) "--enable-liblightdm-qt" - ++ stdenv.lib.optional (qt5 != null) "--enable-liblightdm-qt5"; + ++ stdenv.lib.optional ((qt5.base or null) != null) "--enable-liblightdm-qt5"; installFlags = [ "sysconfdir=\${out}/etc" diff --git a/pkgs/applications/misc/calibre/default.nix b/pkgs/applications/misc/calibre/default.nix index 670d7667e1b9..0f9dbf8d4223 100644 --- a/pkgs/applications/misc/calibre/default.nix +++ b/pkgs/applications/misc/calibre/default.nix @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { buildInputs = [ python pyqt5 sip_4_16 poppler_utils libpng imagemagick libjpeg - fontconfig podofo qt5 pil chmlib icu sqlite libusb1 libmtp xdg_utils + fontconfig podofo qt5.base pil chmlib icu sqlite libusb1 libmtp xdg_utils pythonPackages.mechanize pythonPackages.lxml pythonPackages.dateutil pythonPackages.cssutils pythonPackages.beautifulsoup pythonPackages.pillow pythonPackages.sqlite3 pythonPackages.netifaces pythonPackages.apsw diff --git a/pkgs/applications/networking/irc/quassel/default.nix b/pkgs/applications/networking/irc/quassel/default.nix index b5bf86690edc..5aeafab79e3c 100644 --- a/pkgs/applications/networking/irc/quassel/default.nix +++ b/pkgs/applications/networking/irc/quassel/default.nix @@ -10,6 +10,9 @@ , phonon_qt5, libdbusmenu_qt5 , stdenv, fetchurl, cmake, makeWrapper, qt, automoc4, phonon, dconf }: + +assert stdenv.isLinux; + assert monolithic -> !client && !daemon; assert client || daemon -> !monolithic; assert withKDE -> kdelibs != null; diff --git a/pkgs/applications/networking/linssid/default.nix b/pkgs/applications/networking/linssid/default.nix index 2b4c5f564bec..de5dc849148b 100644 --- a/pkgs/applications/networking/linssid/default.nix +++ b/pkgs/applications/networking/linssid/default.nix @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { sha256 = "13d35rlcjncd8lx3khkgn9x8is2xjd5fp6ns5xsn3w6l4xj9b4gl"; }; - buildInputs = [ qt5 pkgconfig boost ]; + buildInputs = [ qt5.base pkgconfig boost ]; postPatch = '' sed -e "s|/usr/include/|/nonexistent/|g" -i linssid-app/*.pro diff --git a/pkgs/applications/networking/p2p/firestr/default.nix b/pkgs/applications/networking/p2p/firestr/default.nix index 49d15f59c7fa..65ec54cf0f76 100644 --- a/pkgs/applications/networking/p2p/firestr/default.nix +++ b/pkgs/applications/networking/p2p/firestr/default.nix @@ -4,7 +4,7 @@ stdenv.mkDerivation { name = "firestr-0.8"; - buildInputs = [ cmake boost botan snappy libopus libuuid qt5 libXScrnSaver openssl ]; + buildInputs = [ cmake boost botan snappy libopus libuuid qt5.base libXScrnSaver openssl ]; src = fetchFromGitHub { owner = "mempko"; diff --git a/pkgs/applications/video/obs-studio/default.nix b/pkgs/applications/video/obs-studio/default.nix index 87e3047ed19f..e414a6e723a9 100644 --- a/pkgs/applications/video/obs-studio/default.nix +++ b/pkgs/applications/video/obs-studio/default.nix @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { jansson libv4l libxkbcommon - qt5 + qt5.base x264 ]; diff --git a/pkgs/applications/video/shotcut/default.nix b/pkgs/applications/video/shotcut/default.nix index 9ad739a361d7..c0458748c96c 100644 --- a/pkgs/applications/video/shotcut/default.nix +++ b/pkgs/applications/video/shotcut/default.nix @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { sha256 = "1504ds3ppqmpg84nb2gb74qndqysjwn3xw7n8xv19kd1pppnr10f"; }; - buildInputs = [ SDL frei0r gettext makeWrapper mlt pkgconfig qt5 ]; + buildInputs = [ SDL frei0r gettext makeWrapper mlt pkgconfig qt5.base ]; configurePhase = "qmake PREFIX=$out"; diff --git a/pkgs/development/libraries/phonon-backend-vlc/qt4/default.nix b/pkgs/development/libraries/phonon-backend-vlc/qt4/default.nix index 8883f5c11d9e..70b6174c635c 100644 --- a/pkgs/development/libraries/phonon-backend-vlc/qt4/default.nix +++ b/pkgs/development/libraries/phonon-backend-vlc/qt4/default.nix @@ -1,16 +1,13 @@ -{ stdenv, fetchurl, xz, vlc, automoc4, cmake, pkgconfig, phonon -, qt4 ? null, qt5 ? null, withQt5 ? false }: +{ stdenv, fetchurl, xz, vlc, automoc4, cmake, pkgconfig, phonon, qt4}: with stdenv.lib; -assert (withQt5 -> qt5 != null); assert (!withQt5 -> qt4 != null); - let pname = "phonon-backend-vlc"; v = "0.8.1"; # Force same Qt version in phonon and VLC - vlc_ = vlc.override { inherit qt4 qt5 withQt5; }; - phonon_ = phonon.override { inherit qt4 qt5 withQt5; }; + vlc_ = vlc.override { inherit qt4; }; + phonon_ = phonon.override { inherit qt4; }; in stdenv.mkDerivation { @@ -23,9 +20,7 @@ stdenv.mkDerivation { nativeBuildInputs = [ cmake pkgconfig automoc4 xz ]; - buildInputs = [ vlc_ phonon_ (if withQt5 then qt5 else qt4)]; - - cmakeFlags = optional withQt5 "-DPHONON_BUILD_PHONON4QT5=ON"; + buildInputs = [ vlc_ phonon_ qt4 ]; meta = { homepage = http://phonon.kde.org/; diff --git a/pkgs/development/libraries/quazip/default.nix b/pkgs/development/libraries/quazip/default.nix index 9364b94e355e..119fda9eb80a 100644 --- a/pkgs/development/libraries/quazip/default.nix +++ b/pkgs/development/libraries/quazip/default.nix @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { installFlags = "INSTALL_ROOT=$(out)"; - buildInputs = [ zlib qt.base ]; + buildInputs = [ zlib (qt.base or qt) ]; meta = { description = "Provides access to ZIP archives from Qt programs"; |