alioth/nixpkgs
3
0
Fork 0
forked from mirrors/nixpkgs
Code Releases Activity

Merge pull request #42310 from Mic92/lxqt.pavucontrol-qt

Browse source 
lxqt.pavucontrol-qt: fix build
This commit is contained in:
Jörg Thalheim 2018-06-20 23:14:15 +01:00 committed by GitHub
parent 17621f63eb 34758efc70
commit dcacca707f
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 9 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
pkgs/desktops/lxqt/base/lxqt-build-tools/default.nix
View file

@ -1,17 +1,19 @@
{ stdenv, fetchFromGitHub, cmake, pkgconfig, pcre, qt5 }: { stdenv, fetchFromGitHub, cmake, pkgconfig, pcre, qt5, glib }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "lxqt-build-tools-${version}"; name = "lxqt-build-tools-${version}";
version = "0.4.0"; version = "0.5.0";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "lxde"; owner = "lxde";
repo = "lxqt-build-tools"; repo = "lxqt-build-tools";
rev = version; rev = version;
sha256 = "0i3pzgyd80n73dnqs8f6axinaji7biflgqsi33baxn4r1hy58ym1"; sha256 = "0dcwzrijmn4sgivmy2zwz3xa4y69pwhranyw0m90g0pp55di2psz";
}; };
nativeBuildInputs = [ cmake pkgconfig pcre qt5.qtbase ]; nativeBuildInputs = [ cmake pkgconfig ];
buildInputs = [ qt5.qtbase glib pcre ];
preConfigure = ''cmakeFlags+=" -DLXQT_ETC_XDG_DIR=$out/etc/xdg"''; preConfigure = ''cmakeFlags+=" -DLXQT_ETC_XDG_DIR=$out/etc/xdg"'';

6
pkgs/desktops/lxqt/core/pavucontrol-qt/default.nix
View file

@ -3,13 +3,13 @@
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "${pname}-${version}"; name = "${pname}-${version}";
pname = "pavucontrol-qt"; pname = "pavucontrol-qt";
version = "0.3.0"; version = "0.4.0";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "lxde"; owner = "lxde";
repo = pname; repo = pname;
rev = version; rev = version;
sha256 = "1pfqdzsbygvq77npsizydps25d9g6vgw177yqvmz3cg3a68dad27"; sha256 = "1bxqpasfvaagbq8azl7536z2zk2725xg7jkvad5xh95zq1gb4hgk";
}; };
nativeBuildInputs = [ nativeBuildInputs = [
@ -32,7 +32,7 @@ stdenv.mkDerivation rec {
description = "A Pulseaudio mixer in Qt (port of pavucontrol)"; description = "A Pulseaudio mixer in Qt (port of pavucontrol)";
homepage = https://github.com/lxde/pavucontrol-qt; homepage = https://github.com/lxde/pavucontrol-qt;
license = licenses.gpl2; license = licenses.gpl2;
platforms = with platforms; unix; platforms = with platforms; linux;
maintainers = with maintainers; [ romildo ]; maintainers = with maintainers; [ romildo ];
}; };
} }