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

phonon-backend-vlc: use qt5 by default

Browse Source 
`minitube` is currently broken transitively due to the broken
`phonon-backend-qt4`: https://hydra.nixos.org/build/76523277

Although QT4 is fairly old, this package is still built with `qt4` ATM,
however QT5 is available as well. After this change, QT5 will be built
by default and in case anybody requires legacy QT4 it has to be enabled
explicitly like this:

```
with import <nixpkgs> { };
phonon-backend-vlc.override { withQt4 = true; }
```

Now the QT5-only build can be used (which fixes `minitube`) and there
are no confusions anymore with the build dependencies. Previously
`phonon-backend-vlc` and `libsForQt5.phonon-backend-vlc` used `qt4` by
default which was likely responsible for broken `minitube`.
This commit is contained in:
Maximilian Bosch 2018-06-26 17:34:34 +02:00
parent 68bf1063f0
commit 8d6502f8ca
No known key found for this signature in database
GPG Key ID: 091DBF4D1FC46B8E
2 changed files with 12 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
pkgs/development/libraries/phonon/backends/vlc.nix
View File

@ -1,6 +1,6 @@
{ stdenv, lib, fetchurl, cmake, phonon, pkgconfig, vlc { stdenv, lib, fetchurl, cmake, phonon, pkgconfig, vlc
, extra-cmake-modules, qtbase ? null, qtx11extras ? null, qt4 ? null , extra-cmake-modules, qtbase ? null, qtx11extras ? null, qt4 ? null
, withQt5 ? false , withQt4 ? false
, debug ? false , debug ? false
}: }:
@ -11,11 +11,12 @@ let
pname = "phonon-backend-vlc"; pname = "phonon-backend-vlc";
in in
assert withQt5 -> qtbase != null; assert withQt4 -> qt4 != null;
assert withQt5 -> qtx11extras != null; assert !withQt4 -> qtbase != null;
assert !withQt4 -> qtx11extras != null;
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "${pname}-${if withQt5 then "qt5" else "qt4"}-${v}"; name = "${pname}-${if withQt4 then "qt4" else "qt5"}-${v}";
meta = with stdenv.lib; { meta = with stdenv.lib; {
homepage = https://phonon.kde.org/; homepage = https://phonon.kde.org/;
@ -30,11 +31,11 @@ stdenv.mkDerivation rec {
buildInputs = buildInputs =
[ phonon vlc ] [ phonon vlc ]
++ (if withQt5 then [ qtbase qtx11extras ] else [ qt4 ]); ++ (if withQt4 then [ qt4 ] else [ qtbase qtx11extras ]);
nativeBuildInputs = [ cmake pkgconfig ] ++ optional withQt5 extra-cmake-modules; nativeBuildInputs = [ cmake pkgconfig ] ++ optional (!withQt4) extra-cmake-modules;
cmakeFlags = cmakeFlags =
[ "-DCMAKE_BUILD_TYPE=${if debug then "Debug" else "Release"}" ] [ "-DCMAKE_BUILD_TYPE=${if debug then "Debug" else "Release"}" ]
++ optional withQt5 "-DPHONON_BUILD_PHONON4QT5=ON"; ++ optional (!withQt4) "-DPHONON_BUILD_PHONON4QT5=ON";
} }

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

@ -11192,7 +11192,10 @@ with pkgs;
phonon-backend-gstreamer = callPackage ../development/libraries/phonon/backends/gstreamer.nix {}; phonon-backend-gstreamer = callPackage ../development/libraries/phonon/backends/gstreamer.nix {};
phonon-backend-vlc = callPackage ../development/libraries/phonon/backends/vlc.nix {}; # TODO(@Ma27) get rid of that as soon as QT4 can be dropped
phonon-backend-vlc = callPackage ../development/libraries/phonon/backends/vlc.nix {
withQt4 = true;
};
inherit (callPackage ../development/libraries/physfs { }) inherit (callPackage ../development/libraries/physfs { })
physfs_2 physfs_2