about summary refs log tree commit diff
path: root/pkgs/applications/audio
diff options
context:
space:
mode:
authorgoibhniu <cillian.deroiste@gmail.com>2016-05-09 16:55:44 +0200
committergoibhniu <cillian.deroiste@gmail.com>2016-05-09 16:55:44 +0200
commitf9a0e9c649a9c62d17886a655f870450fbc6ac59 (patch)
tree672ef7889825fedd05f45f46f1ce2b208778a0a7 /pkgs/applications/audio
parent52477b0a0b49fc6253872fcdbffa9e40c17fa235 (diff)
parent7eb8e98500b64bffb14736e5a1870f68dc9d3de6 (diff)
downloadnixlib-f9a0e9c649a9c62d17886a655f870450fbc6ac59.tar
nixlib-f9a0e9c649a9c62d17886a655f870450fbc6ac59.tar.gz
nixlib-f9a0e9c649a9c62d17886a655f870450fbc6ac59.tar.bz2
nixlib-f9a0e9c649a9c62d17886a655f870450fbc6ac59.tar.lz
nixlib-f9a0e9c649a9c62d17886a655f870450fbc6ac59.tar.xz
nixlib-f9a0e9c649a9c62d17886a655f870450fbc6ac59.tar.zst
nixlib-f9a0e9c649a9c62d17886a655f870450fbc6ac59.zip
Merge pull request #15233 from joelmo/qjackctl
qjackctl: 4.0 -> 4.2, qt4 -> qt5
Diffstat (limited to 'pkgs/applications/audio')
-rw-r--r--pkgs/applications/audio/qjackctl/default.nix14
1 files changed, 10 insertions, 4 deletions
diff --git a/pkgs/applications/audio/qjackctl/default.nix b/pkgs/applications/audio/qjackctl/default.nix
index 90129d6404b7..db73901d2aad 100644
--- a/pkgs/applications/audio/qjackctl/default.nix
+++ b/pkgs/applications/audio/qjackctl/default.nix
@@ -1,17 +1,23 @@
-{ stdenv, fetchurl, qt4, alsaLib, libjack2, dbus }:
+{ stdenv, fetchurl, alsaLib, libjack2, dbus, qt5 }:
 
 stdenv.mkDerivation rec {
-  version = "0.4.0";
+  version = "0.4.2";
   name = "qjackctl-${version}";
 
   # some dependencies such as killall have to be installed additionally
 
   src = fetchurl {
     url = "mirror://sourceforge/qjackctl/${name}.tar.gz";
-    sha256 = "0nj8c8vy00524hbjqwsqkliblcf9j7h46adk6v5np645pp2iqrav";
+    sha256 = "0pmgkqgkapbma42zqb5if4ngmj183rxl8bhjm7mhyhgq4bzll76g";
   };
 
-  buildInputs = [ qt4 alsaLib libjack2 dbus ];
+  buildInputs = [ 
+    qt5.full
+    qt5.qtx11extras
+    alsaLib 
+    libjack2
+    dbus 
+  ];
 
   configureFlags = "--enable-jack-version";