diff options
Diffstat (limited to 'pkgs/applications')
-rw-r--r-- | pkgs/applications/kde/kdenlive.nix | 6 | ||||
-rw-r--r-- | pkgs/applications/misc/lyx/default.nix | 5 | ||||
-rw-r--r-- | pkgs/applications/networking/p2p/qbittorrent/default.nix | 4 |
3 files changed, 5 insertions, 10 deletions
diff --git a/pkgs/applications/kde/kdenlive.nix b/pkgs/applications/kde/kdenlive.nix index 854e346e2909..17d7da7b702c 100644 --- a/pkgs/applications/kde/kdenlive.nix +++ b/pkgs/applications/kde/kdenlive.nix @@ -2,7 +2,6 @@ , lib , extra-cmake-modules , kdoctools -, qtscript , kactivities , kconfig , kcrash @@ -27,7 +26,10 @@ , kfilemetadata , ffmpeg , phonon-backend-gstreamer +, qtdeclarative , qtquickcontrols +, qtscript +, qtwebkit }: mkDerivation { @@ -56,8 +58,10 @@ mkDerivation { ktextwidgets mlt phonon-backend-gstreamer + qtdeclarative qtquickcontrols qtscript + qtwebkit shared_mime_info libv4l ffmpeg diff --git a/pkgs/applications/misc/lyx/default.nix b/pkgs/applications/misc/lyx/default.nix index 0c08929417e6..e3c4943cb2fe 100644 --- a/pkgs/applications/misc/lyx/default.nix +++ b/pkgs/applications/misc/lyx/default.nix @@ -18,11 +18,6 @@ stdenv.mkDerivation rec { hunspell makeWrapper # enchant ]; - # bogus configure script tests - preConfigure = '' - NIX_CFLAGS_COMPILE+=" $(pkg-config --cflags Qt5Core)" - ''; - configureFlags = [ "--enable-qt5" #"--without-included-boost" diff --git a/pkgs/applications/networking/p2p/qbittorrent/default.nix b/pkgs/applications/networking/p2p/qbittorrent/default.nix index 9b6f2f1f1bb1..3bb65123c81e 100644 --- a/pkgs/applications/networking/p2p/qbittorrent/default.nix +++ b/pkgs/applications/networking/p2p/qbittorrent/default.nix @@ -22,10 +22,6 @@ stdenv.mkDerivation rec { buildInputs = [ boost libtorrentRasterbar qtbase qttools ] ++ optional guiSupport dbus_libs; - preConfigure = '' - export QT_QMAKE=$(dirname "$QMAKE") - ''; - configureFlags = [ "--with-boost-libdir=${boost.out}/lib" "--with-boost=${boost.dev}" |