From d6dd2ab324d019645e227fe55cad60f7d11584cd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bj=C3=B8rn=20Forsman?= <bjorn.forsman@gmail.com>
Date: Thu, 25 Aug 2016 11:18:55 +0200
Subject: [PATCH] qmmp: 0.9.9 -> 1.1.2
This update makes the switch from Qt 4 to Qt 5.
---
pkgs/applications/audio/qmmp/default.nix | 10 ++++++----
pkgs/top-level/all-packages.nix | 2 +-
2 files changed, 7 insertions(+), 5 deletions(-)
diff --git a/pkgs/applications/audio/qmmp/default.nix b/pkgs/applications/audio/qmmp/default.nix
index d0d37fb15a14..e83106cf1876 100644
--- a/pkgs/applications/audio/qmmp/default.nix
+++ b/pkgs/applications/audio/qmmp/default.nix
@@ -1,4 +1,5 @@
-{ stdenv, fetchurl, cmake, qt4, pkgconfig, xlibsWrapper
+{ stdenv, fetchurl, cmake, pkgconfig, xlibsWrapper
+, qtbase, qttools, qtmultimedia, qtx11extras
# transports
, curl, libmms
# input plugins
@@ -28,16 +29,17 @@
# handle that.
stdenv.mkDerivation rec {
- name = "qmmp-0.9.9";
+ name = "qmmp-1.1.2";
src = fetchurl {
url = "http://qmmp.ylsoftware.com/files/${name}.tar.bz2";
- sha256 = "1wv4kbjq50xflhrl1jjf1hm3rrw599xkd72dwm4rscm0sdvzhnc1";
+ sha256 = "023gvgchk6ybkz3miy0z08j9n5awz5cjvav7fqjdmpix4sivhn5q";
};
buildInputs =
[ # basic requirements
- cmake qt4 pkgconfig xlibsWrapper
+ cmake pkgconfig xlibsWrapper
+ qtbase qttools qtmultimedia qtx11extras
# transports
curl libmms
# input plugins
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 19ea5da3f8a1..f9e2d62fa05b 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -14447,7 +14447,7 @@ in
qmidiroute = callPackage ../applications/audio/qmidiroute { };
- qmmp = callPackage ../applications/audio/qmmp { };
+ qmmp = qt5.callPackage ../applications/audio/qmmp { };
qnotero = callPackage ../applications/office/qnotero { };