about summary refs log tree commit diff
diff options
context:
space:
mode:
authorNikolay Amiantov <ab@fmap.me>2017-02-03 18:19:44 +0300
committerNikolay Amiantov <ab@fmap.me>2017-02-03 18:21:14 +0300
commitc7d7ad1d9f5cf57970ca15757363c21a6218ca6d (patch)
tree5b3fccf7c8cd77da0f97f490f527359319caa9dc
parent99a83fbe1de57a25fc779a153075cdae7cc3e46e (diff)
downloadnixlib-c7d7ad1d9f5cf57970ca15757363c21a6218ca6d.tar
nixlib-c7d7ad1d9f5cf57970ca15757363c21a6218ca6d.tar.gz
nixlib-c7d7ad1d9f5cf57970ca15757363c21a6218ca6d.tar.bz2
nixlib-c7d7ad1d9f5cf57970ca15757363c21a6218ca6d.tar.lz
nixlib-c7d7ad1d9f5cf57970ca15757363c21a6218ca6d.tar.xz
nixlib-c7d7ad1d9f5cf57970ca15757363c21a6218ca6d.tar.zst
nixlib-c7d7ad1d9f5cf57970ca15757363c21a6218ca6d.zip
qjackctl: don't use qt.full
-rw-r--r--pkgs/applications/audio/qjackctl/default.nix9
-rw-r--r--pkgs/top-level/all-packages.nix2
2 files changed, 6 insertions, 5 deletions
diff --git a/pkgs/applications/audio/qjackctl/default.nix b/pkgs/applications/audio/qjackctl/default.nix
index c84e5cdfb494..52b94ca07d9e 100644
--- a/pkgs/applications/audio/qjackctl/default.nix
+++ b/pkgs/applications/audio/qjackctl/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, alsaLib, libjack2, dbus, qt5 }:
+{ stdenv, fetchurl, alsaLib, libjack2, dbus, qtbase, qttools, qtx11extras }:
 
 stdenv.mkDerivation rec {
   version = "0.4.3";
@@ -12,14 +12,15 @@ stdenv.mkDerivation rec {
   };
 
   buildInputs = [
-    qt5.full
-    qt5.qtx11extras
+    qtbase
+    qtx11extras
+    qttools
     alsaLib
     libjack2
     dbus
   ];
 
-  configureFlags = "--enable-jack-version";
+  configureFlags = [ "--enable-jack-version" ];
 
   meta = with stdenv.lib; {
     description = "A Qt application to control the JACK sound server daemon";
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 04ce743e2a72..b53569a11954 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -14670,7 +14670,7 @@ with pkgs;
 
   qgroundcontrol = qt55.callPackage ../applications/science/robotics/qgroundcontrol { };
 
-  qjackctl = callPackage ../applications/audio/qjackctl { };
+  qjackctl = qt5.callPackage ../applications/audio/qjackctl { };
 
   qmidinet = callPackage ../applications/audio/qmidinet { };