From 263132f5d6ba61a49808e5071f3e94d248191482 Mon Sep 17 00:00:00 2001 From: Nikolay Amiantov Date: Sun, 14 Sep 2014 00:04:52 +0400 Subject: [PATCH 1/3] Added me as a maintainer. --- lib/maintainers.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/lib/maintainers.nix b/lib/maintainers.nix index d5e6a52c767..a9dd22db612 100644 --- a/lib/maintainers.nix +++ b/lib/maintainers.nix @@ -10,6 +10,7 @@ akc = "Anders Claesson "; algorith = "Dries Van Daele "; all = "Nix Committers "; + abbradar = "Nikolay Amiantov "; amiddelk = "Arie Middelkoop "; amorsillo = "Andrew Morsillo "; AndersonTorres = "Anderson Torres "; From d006273e7a42328d8bb7d51c3e4e06345b8178d2 Mon Sep 17 00:00:00 2001 From: Nikolay Amiantov Date: Sun, 28 Sep 2014 21:19:50 +0400 Subject: [PATCH 2/3] pavucontrol: Adopt and clean dependencies --- pkgs/applications/audio/pavucontrol/default.nix | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) diff --git a/pkgs/applications/audio/pavucontrol/default.nix b/pkgs/applications/audio/pavucontrol/default.nix index ca08624e98f..538e1cdf9d0 100644 --- a/pkgs/applications/audio/pavucontrol/default.nix +++ b/pkgs/applications/audio/pavucontrol/default.nix @@ -1,5 +1,5 @@ -{ fetchurl, stdenv, pkgconfig, pulseaudio, gtkmm3 -, libcanberra_gtk3, intltool, gettext }: +{ fetchurl, stdenv, pkgconfig, intltool, pulseaudio, gtkmm3 +, libcanberra_gtk3 }: stdenv.mkDerivation rec { name = "pavucontrol-2.0"; @@ -9,12 +9,13 @@ stdenv.mkDerivation rec { sha256 = "02s775m1531sshwlbvfddk3pz8zjmwkv1sgzggn386ja3gc9vwi2"; }; - buildInputs = [ pkgconfig pulseaudio gtkmm3 libcanberra_gtk3 - intltool gettext ]; + buildInputs = [ pulseaudio gtkmm3 libcanberra_gtk3 ]; - configureFlags = "--disable-lynx"; + nativeBuildInputs = [ pkgconfig intltool ]; - meta = { + configureFlags = [ "--disable-lynx" ]; + + meta = with stdenv.lib; { description = "PulseAudio Volume Control"; longDescription = '' @@ -27,7 +28,7 @@ stdenv.mkDerivation rec { license = stdenv.lib.licenses.gpl2Plus; - maintainers = [ ]; - platforms = stdenv.lib.platforms.gnu; # arbitrary choice + maintainers = [ maintainers.abbradar ]; + platforms = platforms.linux; }; } From 0728fee205bed31cb04df194aed995b12c0d4397 Mon Sep 17 00:00:00 2001 From: Nikolay Amiantov Date: Sun, 28 Sep 2014 21:48:28 +0400 Subject: [PATCH 3/3] paprefs: Add package --- pkgs/applications/audio/paprefs/default.nix | 33 +++++++++++++++++++++ pkgs/top-level/all-packages.nix | 4 +++ 2 files changed, 37 insertions(+) create mode 100644 pkgs/applications/audio/paprefs/default.nix diff --git a/pkgs/applications/audio/paprefs/default.nix b/pkgs/applications/audio/paprefs/default.nix new file mode 100644 index 00000000000..f05c4068a60 --- /dev/null +++ b/pkgs/applications/audio/paprefs/default.nix @@ -0,0 +1,33 @@ +{ fetchurl, stdenv, pkgconfig, pulseaudio, gtkmm, libglademm +, dbus_glib, gconfmm, intltool }: + +stdenv.mkDerivation rec { + name = "paprefs-0.9.10"; + + src = fetchurl { + url = "http://freedesktop.org/software/pulseaudio/paprefs/${name}.tar.xz"; + sha256 = "1c5b3sb881szavly220q31g7rvpn94wr7ywlk00hqb9zaikml716"; + }; + + buildInputs = [ pulseaudio gtkmm libglademm dbus_glib gconfmm ]; + + nativeBuildInputs = [ pkgconfig intltool ]; + + configureFlags = [ "--disable-lynx" ]; + + meta = with stdenv.lib; { + description = "PulseAudio Preferences"; + + longDescription = '' + PulseAudio Preferences (paprefs) is a simple GTK based configuration + dialog for the PulseAudio sound server. + ''; + + homepage = http://freedesktop.org/software/pulseaudio/paprefs/ ; + + license = licenses.gpl2Plus; + + maintainers = [ maintainers.abbradar ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index bb4c48148b6..132cbe0254b 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -9745,6 +9745,10 @@ let panotools = callPackage ../applications/graphics/panotools { }; + paprefs = callPackage ../applications/audio/paprefs { + inherit (gnome) libglademm gconfmm; + }; + pavucontrol = callPackage ../applications/audio/pavucontrol { }; paraview = callPackage ../applications/graphics/paraview { };