Merge pull request #31009 from jokogr/f/pavucontrol-qt5

pavucontrol-qt: use libsForQt5.callPackage
This commit is contained in:
Orivej Desh 2017-11-02 18:04:13 +00:00 committed by GitHub
commit 86b3c73ac8
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 5 additions and 5 deletions

View file

@ -1,4 +1,4 @@
{ stdenv, fetchFromGitHub, cmake, pkgconfig, qt5, lxqt, libpulseaudio, pcre }:
{ stdenv, fetchFromGitHub, cmake, pkgconfig, lxqt, libpulseaudio, pcre, qtbase, qttools, qtx11extras }:
stdenv.mkDerivation rec {
name = "${pname}-${version}";
@ -19,9 +19,9 @@ stdenv.mkDerivation rec {
];
buildInputs = [
qt5.qtbase
qt5.qttools
qt5.qtx11extras
qtbase
qttools
qtx11extras
libpulseaudio
pcre
];

View file

@ -27,7 +27,7 @@ let
lxqt-session = callPackage ./core/lxqt-session { };
lxqt-sudo = callPackage ./core/lxqt-sudo { };
lxqt-themes = callPackage ./core/lxqt-themes { };
pavucontrol-qt = callPackage ./core/pavucontrol-qt { };
pavucontrol-qt = libsForQt5.callPackage ./core/pavucontrol-qt { };
qtermwidget = callPackage ./core/qtermwidget { };
# for now keep version 0.7.1 because virt-manager-qt currently does not compile with qtermwidget-0.8.0
qtermwidget_0_7_1 = callPackage ./core/qtermwidget/0.7.1.nix { };