diff options
| author | Jan Tojnar <jtojnar@gmail.com> | 2019-11-21 21:26:38 +0100 |
|---|---|---|
| committer | Jan Tojnar <jtojnar@gmail.com> | 2019-11-22 20:25:48 +0100 |
| commit | 62a09e70299f2016a18bf787f1e1d97720284baa (patch) | |
| tree | 63426093dfb52c937410b0e7f36cbcaf241a961d /pkgs/top-level | |
| parent | c3c30bc59e6a2cd95380ef57c77e34698c2ff60d (diff) | |
| download | nixpkgs-62a09e70299f2016a18bf787f1e1d97720284baa.tar nixpkgs-62a09e70299f2016a18bf787f1e1d97720284baa.tar.gz nixpkgs-62a09e70299f2016a18bf787f1e1d97720284baa.tar.bz2 nixpkgs-62a09e70299f2016a18bf787f1e1d97720284baa.tar.lz nixpkgs-62a09e70299f2016a18bf787f1e1d97720284baa.tar.xz nixpkgs-62a09e70299f2016a18bf787f1e1d97720284baa.tar.zst nixpkgs-62a09e70299f2016a18bf787f1e1d97720284baa.zip | |
phonon: remove qt4
Qt4 is no longer supported. https://phabricator.kde.org/D22688 Co-authored-by: worldofpeace <worldofpeace@protonmail.ch>
Diffstat (limited to 'pkgs/top-level')
| -rw-r--r-- | pkgs/top-level/aliases.nix | 1 | ||||
| -rw-r--r-- | pkgs/top-level/all-packages.nix | 6 |
2 files changed, 2 insertions, 5 deletions
diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index 149f70bec42..238f7b94772 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -311,6 +311,7 @@ mapAliases ({ pulseaudioLight = pulseaudio; # added 2018-04-25 phonon-backend-gstreamer = throw "Please use libsForQt5.phonon-backend-gstreamer, as Qt4 support in this package has been removed."; # added 2019-11-22 phonon-backend-vlc = throw "Please use libsForQt5.phonon-backend-vlc, as Qt4 support in this package has been removed."; # added 2019-11-22 + phonon = throw "Please use libsForQt5.phonon, as Qt4 support in this package has been removed."; # added 2019-11-22 qca-qt5 = libsForQt5.qca-qt5; # added 2015-12-19 quake3game = ioquake3; # added 2016-01-14 qwt6 = libsForQt5.qwt; # added 2015-12-19 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 486d8f242dd..aa576af1000 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -13412,8 +13412,6 @@ in pdf2xml = callPackage ../development/libraries/pdf2xml {} ; - phonon = callPackage ../development/libraries/phonon {}; - inherit (callPackage ../development/libraries/physfs { }) physfs_2 physfs; @@ -13698,9 +13696,7 @@ in openbr = callPackage ../development/libraries/openbr { }; - phonon = callPackage ../development/libraries/phonon { - withQt5 = true; - }; + phonon = callPackage ../development/libraries/phonon { }; phonon-backend-gstreamer = callPackage ../development/libraries/phonon/backends/gstreamer.nix { }; |