diff options
Diffstat (limited to 'pkgs/development')
6 files changed, 22 insertions, 16 deletions
diff --git a/pkgs/development/libraries/libdbusmenu-qt/qt5.nix b/pkgs/development/libraries/libdbusmenu-qt/qt5.nix index 99a13edf8f4a..5f76162453c4 100644 --- a/pkgs/development/libraries/libdbusmenu-qt/qt5.nix +++ b/pkgs/development/libraries/libdbusmenu-qt/qt5.nix @@ -9,7 +9,7 @@ stdenv.mkDerivation { sha256 = "1dbhaljyivbv3wc184zpjfjmn24zb6aj72wgg1gg1xl5f783issd"; }; - buildInputs = [ qt5 ]; + buildInputs = [ qt5.base ]; nativeBuildInputs = [ cmake ]; cmakeFlags = "-DWITH_DOC=OFF"; @@ -18,6 +18,6 @@ stdenv.mkDerivation { homepage = "http://launchpad.net/libdbusmenu-qt"; description = "Provides a Qt implementation of the DBusMenu spec"; maintainers = [ maintainers.ttuegel ]; - inherit (qt5.meta) platforms; + inherit (qt5.base.meta) platforms; }; } diff --git a/pkgs/development/libraries/phonon-backend-gstreamer/qt5/default.nix b/pkgs/development/libraries/phonon-backend-gstreamer/qt5/default.nix index 8553e060c565..bc34d249b46d 100644 --- a/pkgs/development/libraries/phonon-backend-gstreamer/qt5/default.nix +++ b/pkgs/development/libraries/phonon-backend-gstreamer/qt5/default.nix @@ -1,4 +1,6 @@ -{ stdenv, fetchurl, cmake, qt5, pkgconfig, phonon_qt5, gst_all_1 }: +{ stdenv, fetchurl, cmake, gst_all_1, phonon_qt5, pkgconfig, qt5, debug ? false }: + +with stdenv.lib; let version = "4.8.2"; @@ -13,14 +15,15 @@ stdenv.mkDerivation rec { sha256 = "1q1ix6zsfnh6gfnpmwp67s376m7g7ahpjl1qp2fqakzb5cgzgq10"; }; - buildInputs = with gst_all_1; [ phonon_qt5 qt5 gstreamer gst-plugins-base ]; + buildInputs = with gst_all_1; [ gstreamer gst-plugins-base phonon_qt5 qt5.base ]; nativeBuildInputs = [ cmake pkgconfig ]; cmakeFlags = [ "-DCMAKE_INSTALL_LIBDIR=lib" "-DPHONON_BUILD_PHONON4QT5=ON" - ]; + ] + ++ optional debug "-DCMAKE_BUILD_TYPE=Debug"; meta = with stdenv.lib; { homepage = http://phonon.kde.org/; diff --git a/pkgs/development/libraries/phonon-backend-vlc/qt5/default.nix b/pkgs/development/libraries/phonon-backend-vlc/qt5/default.nix index 9e826cb65dc3..b7e4dc7c2b0d 100644 --- a/pkgs/development/libraries/phonon-backend-vlc/qt5/default.nix +++ b/pkgs/development/libraries/phonon-backend-vlc/qt5/default.nix @@ -11,7 +11,6 @@ let qt4 = null; withQt5 = true; }; - phonon_ = phonon.override { inherit qt4 qt5 withQt5; }; in stdenv.mkDerivation { @@ -24,7 +23,7 @@ stdenv.mkDerivation { nativeBuildInputs = [ cmake pkgconfig xz ]; - buildInputs = [ vlc_ phonon_qt5 qt5]; + buildInputs = [ vlc_ phonon_qt5 qt5.base ]; cmakeFlags = ["-DPHONON_BUILD_PHONON4QT5=ON"]; diff --git a/pkgs/development/libraries/phonon/qt5/default.nix b/pkgs/development/libraries/phonon/qt5/default.nix index 187684ca5be0..248e04277092 100644 --- a/pkgs/development/libraries/phonon/qt5/default.nix +++ b/pkgs/development/libraries/phonon/qt5/default.nix @@ -1,24 +1,28 @@ -{ stdenv, fetchurl, cmake, automoc4, pulseaudio, qt5 }: +{ stdenv, fetchurl, cmake, mesa, pkgconfig, pulseaudio, qt5, debug ? false }: with stdenv.lib; let - v = "4.8.1"; + v = "4.8.3"; in stdenv.mkDerivation rec { name = "phonon-${v}"; src = fetchurl { - url = "mirror://kde/stable/phonon/${v}/phonon-${v}.tar.xz"; - sha256 = "1l97h1jj3gvl1chx1qbipizfvjgqc05wrhdcflc76c2krlk03jmn"; + url = "mirror://kde/stable/phonon/${v}/src/phonon-${v}.tar.xz"; + sha256 = "05nshngk03ln90vsjz44dx8al576f4vd5fvhs1l0jmx13jb9q551"; }; - buildInputs = [ qt5 pulseaudio ]; + buildInputs = [ mesa qt5.base qt5.quick1 qt5.tools pulseaudio ]; - nativeBuildInputs = [ cmake automoc4 ]; + nativeBuildInputs = [ cmake pkgconfig ]; - cmakeFlags = ["-DPHONON_BUILD_PHONON4QT5=ON"]; + cmakeFlags = [ + "-DPHONON_BUILD_PHONON4QT5=ON" + "-DCMAKE_INSTALL_LIBDIR=lib" + ] + ++ optional debug "-DCMAKE_BUILD_TYPE=Debug"; meta = { homepage = http://phonon.kde.org/; diff --git a/pkgs/development/libraries/polkit-qt-1/default.nix b/pkgs/development/libraries/polkit-qt-1/default.nix index c60ae560fe59..b887134e5b93 100644 --- a/pkgs/development/libraries/polkit-qt-1/default.nix +++ b/pkgs/development/libraries/polkit-qt-1/default.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation { nativeBuildInputs = [ cmake automoc4 pkgconfig ]; - propagatedBuildInputs = [ polkit glib (if withQt5 then qt5 else qt4) ]; + propagatedBuildInputs = [ polkit glib ] ++ (if withQt5 then [qt5.base] else [qt4]); meta = { description = "A Qt wrapper around PolKit"; diff --git a/pkgs/development/libraries/poppler/default.nix b/pkgs/development/libraries/poppler/default.nix index 226aeab1051c..2c310603b78e 100644 --- a/pkgs/development/libraries/poppler/default.nix +++ b/pkgs/development/libraries/poppler/default.nix @@ -72,7 +72,7 @@ let }; poppler_qt5 = poppler_drv "qt5" { - propagatedBuildInputs = [ qt5 poppler_glib ]; + propagatedBuildInputs = [ qt5.base poppler_glib ]; postConfigure = '' mkdir -p "$out/lib/pkgconfig" install -c -m 644 poppler-qt5.pc "$out/lib/pkgconfig" |